You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@corinthia.apache.org by ja...@apache.org on 2015/02/13 09:21:30 UTC
[01/33] incubator-corinthia git commit: extract_downloads.bat and
helper unzip-win.js 1.00
Repository: incubator-corinthia
Updated Branches:
refs/heads/experiment64 e8d93d482 -> 8fbfecab5
extract_downloads.bat and helper unzip-win.js 1.00
The pair of scripts provide custom extraction of external downloads for
win32 x86 dependencies from Corinthia components. Implementation uses
native Windows technology with no additional components required.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/13846644
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/13846644
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/13846644
Branch: refs/heads/experiment64
Commit: 13846644c85b27a4500717ddb2e02e07e56fa041
Parents: e8d93d4
Author: Dennis Hamilton <or...@apache.org>
Authored: Fri Jan 2 16:43:19 2015 -0800
Committer: Dennis Hamilton <or...@apache.org>
Committed: Fri Jan 2 17:09:41 2015 -0800
----------------------------------------------------------------------
external/extract_downloads.bat | 118 ++++++++++++++++++++++++++++++++++++
external/unzip-win.js | 46 ++++++++++++++
2 files changed, 164 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/13846644/external/extract_downloads.bat
----------------------------------------------------------------------
diff --git a/external/extract_downloads.bat b/external/extract_downloads.bat
new file mode 100644
index 0000000..4157a8e
--- /dev/null
+++ b/external/extract_downloads.bat
@@ -0,0 +1,118 @@
+@echo off
+rem extract_downloads.bat 1.00 UTF-8
+rem EXTRACT THE EXTERNAL DOWNLOADS TO INCLUDE, LIB, AND BIN FOLDERS
+
+rem Fetch downloads in case not done yet
+CALL "%~dp0fetch_downloads.bat"
+
+rem Determine if any of the packages are missing
+SET extract_downloads=
+CALL :CHECKON zlib128-dll.zip
+CALL :CHECKON iconv-1.9.2.win32.zip
+CALL :CHECKON libxml2-2.7.8.win32.zip
+CALL :CHECKON SDL2-devel-2.0.3-VC.zip
+CALL :CHECKON SDL2_image-devel-2.0.0-VC.zip
+
+rem This procedure can't proceed unless all are present
+IF NOT "%extract_downloads%" == "" GOTO :FAIL1
+
+CALL :CLEAN
+
+rem For extractions, use the zip name listed and the path, if any, from the
+rem root of the zipped hierarchy to the level where include and libs are found
+
+CALL :SDL2x86 SDL2-devel-2.0.3-VC.zip SDL2-2.0.3\
+CALL :SDL2x86 SDL2_image-devel-2.0.0-VC.zip SDL2_image-2.0.0\
+CALL :ICONV iconv-1.9.2.win32.zip iconv-1.9.2.win32\
+CALL :LIBXML2 libxml2-2.7.8.win32.zip libxml2-2.7.8.win32\
+CALL :ZLIB zlib128-dll.zip ""
+
+EXIT /B 0
+
+rem MOST MAINTENANCE IS BY UPDATING THE FILENAMES AND TOP PATHES ABOVE.
+rem The extraction procedure do not require maintenance unless there is
+rem a Zip layout change or new extraction cases are needed.
+
+rem CUSTOM EXTRACTION CASES FOR COLLECTING EXTERNAL INCLUDES, LIBS, AND BINS
+rem Each one of these cases below accepts two parameters
+rem %1 is the filename of the zip file, to be unzipped from
+rem %~dp0download\%1 with expansion to folder %~dp0download\T
+rem %2 is the path from T to the level at which parts like include
+rem and lib are to be found. %2 is either empty or it is one or more
+rem path segments each ending with "\".
+
+:SDL2x86
+rem taking T\%2include and T\%2lib\*.lib across, with T\%2lib\*.dll to bin
+CALL :UNZIP %1
+XCOPY "%~dp0download\T\%2include\*.*" "%~dp0download\include" /I /Q /Y >nul
+XCOPY "%~dp0download\T\%2lib\x86\*.lib" "%~dp0download\lib" /I /Q /Y >nul
+XCOPY "%~dp0download\T\%2lib\x86\*.dll" "%~dp0download\bin" /I /Q /Y >nul
+EXIT /B 0
+
+:ICONV
+rem taking T\%2include, T\%2lib, and T\%2bin\*.dll across
+CALL :UNZIP %1
+XCOPY "%~dp0download\T\%2include\*.*" "%~dp0download\include" /I /Q /Y >nul
+XCOPY "%~dp0download\T\%2lib\*.*" "%~dp0download\lib" /I /Q /Y >nul
+XCOPY "%~dp0download\T\%2bin\*.dll" "%~dp0download\bin" /I /Q /Y >nul
+EXIT /B 0
+
+:LIBXML2
+rem taking T\%2include\libxml\, T\%2lib, and T\%2bin\*.dll across
+CALL :UNZIP %1
+XCOPY "%~dp0download\T\%2include\libxml\*.*" "%~dp0download\include\libxml" /I /Q /Y >nul 2>&1
+XCOPY "%~dp0download\T\%2lib\*.*" "%~dp0download\lib" /I /Q /Y >nul
+XCOPY "%~dp0download\T\%2bin\*.dll" "%~dp0download\bin" /I /Q /Y >nul
+EXIT /B 0
+
+:ZLIB
+rem taking all across from T\%2include and T\%2lib, with T\%2*.dll to bin
+CALL :UNZIP %1
+XCOPY "%~dp0download\T\%2include\*.*" "%~dp0download\include" /I /Q /Y >nul
+XCOPY "%~dp0download\T\%2lib\*.*" "%~dp0download\lib" /I /Q /Y >nul
+XCOPY "%~dp0download\T\%2*.dll" "%~dp0download\bin" /I /Q /Y >nul
+EXIT /B 0
+
+:UNZIP
+rem EXTRACT ALL OF ZIP "%~dp0download\%1" TO "%~dp0download\T"
+rem "%~dp0download\T" is not deleted until needed again, leaving the
+rem last one for inspection when trouble-shooting.
+RMDIR /S /Q "%~dp0download\T" >nul
+ECHO: extracting %1
+Cscript /nologo "%~dp0unzip-win.js" //B "%~dp0download\%1" "%~dp0download\T"
+EXIT /B 0
+
+:CHECKON
+IF EXIST "%~dp0download\%1" EXIT /B 0
+IF "%extract_downloads%" == "" ECHO:
+ECHO: *** %1 UNAVAILABLE FOR EXTRACTION
+SET extract_downloads=0
+EXIT /B 2
+
+:CLEAN
+rem clean out any previous material and be quiet about it
+RMDIR /S /Q "%~dp0download\include" >nul
+RMDIR /S /Q "%~dp0download\lib" >nul
+RMDIR /S /Q "%~dp0download\bin" >nul
+rem set up empty include, lib, and bin to receive fresh extractions
+MKDIR "%~dp0download\include"
+MKDIR "%~dp0download\lib"
+MKDIR "%~dp0download\bin"
+EXIT /B 0
+
+:FAIL1
+SET extract_downloads=
+ECHO: *** EXTRACTION REQUIRES ALL OF THE DOWNLOADS TO BE AVAILABLE
+ECHO: *** Ensure that the archives downloaded by fetch_downloads.bat and
+ECHO: *** expected here are the same. If the unavailable archives are
+ECHO: *** no longer found at the URLs used in fetch_downloads.bat, find
+ECHO: *** alternative locations for them.
+ECHO: *** No extractions have been performed.
+ECHO:
+EXIT /B 2
+
+rem 1.00 2015-01-02-16:25 Complete Full-Functioning Externals Extraction
+rem Delivering the download\include, donwload\lib, and download\bin
+rem collections established for the current external downloads.
+
+rem *** end of extract_downloads.bat ***
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/13846644/external/unzip-win.js
----------------------------------------------------------------------
diff --git a/external/unzip-win.js b/external/unzip-win.js
new file mode 100644
index 0000000..8c89e19
--- /dev/null
+++ b/external/unzip-win.js
@@ -0,0 +1,46 @@
+/* unzip-win.js 1.00 UTF-8
+ * USE WINDOWS SHELL TO EXTRACT ALL FROM ZIPS
+ *
+ * Cscript unzip-win.js zip dest
+ * performas an "extract all" of the zip to the dest folder, where
+ *
+ * zip is the full path file location of the zip to extract
+ * dest is the full path of the folder to which extraction occurs
+ *
+ * This is a helper script designed to be used with a larger script or
+ * batch file that provides clean parameters and usage.
+ *
+ * The present script is adapted from the solution by Greg Zakharov at
+ * <http://stackoverflow.com/a/19711019/33810> on 2013-10-31.
+ *
+ * TODO
+ * It is a little startling when the Windows copying-files animation
+ * pops up when one of these runs long enough for its visibility.
+ * Find a way to inhibit that, if possible.
+ */
+
+
+try
+{ var zip = WScript.Arguments(0);
+ var dest = WScript.Arguments(1);
+
+ with (new ActiveXObject('Scripting.FileSystemObject'))
+ {
+ if (!FolderExists(dest)) CreateFolder(dest);
+ with (new ActiveXObject('Shell.Application'))
+ {
+ NameSpace(GetFolder(dest).Path)
+ .CopyHere(Namespace(GetFile(zip).Path).Items());
+ }
+ }
+}
+catch (e)
+{
+ WScript.echo(e.message);
+}
+
+/* 1.00 2015-01-02 Complete Adaptation for Corinthia Externals Extraction
+ */
+
+/* *** end of unzip-win.js *** */
+
[27/33] incubator-corinthia git commit: Update copyright notice
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/Equations.js
----------------------------------------------------------------------
diff --git a/Editor/src/Equations.js b/Editor/src/Equations.js
index d18d21d..46bace8 100644
--- a/Editor/src/Equations.js
+++ b/Editor/src/Equations.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var Equations_insertEquation;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/Figures.js
----------------------------------------------------------------------
diff --git a/Editor/src/Figures.js b/Editor/src/Figures.js
index 21c8511..dcda1fc 100644
--- a/Editor/src/Figures.js
+++ b/Editor/src/Figures.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var Figures_insertFigure;
var Figures_getSelectedFigureId;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/Formatting.js
----------------------------------------------------------------------
diff --git a/Editor/src/Formatting.js b/Editor/src/Formatting.js
index 625b928..0f2d9d4 100644
--- a/Editor/src/Formatting.js
+++ b/Editor/src/Formatting.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var Formatting_splitTextBefore;
var Formatting_splitTextAfter;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/Hierarchy.js
----------------------------------------------------------------------
diff --git a/Editor/src/Hierarchy.js b/Editor/src/Hierarchy.js
index 3151082..07c0526 100644
--- a/Editor/src/Hierarchy.js
+++ b/Editor/src/Hierarchy.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var Hierarchy_ensureValidHierarchy;
var Hierarchy_ensureInlineNodesInParagraph;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/Input.js
----------------------------------------------------------------------
diff --git a/Editor/src/Input.js b/Editor/src/Input.js
index 0be1294..db8cb99 100644
--- a/Editor/src/Input.js
+++ b/Editor/src/Input.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var Input_removePosition;
var Input_addPosition;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/Lists.js
----------------------------------------------------------------------
diff --git a/Editor/src/Lists.js b/Editor/src/Lists.js
index 2a72520..a3a9772 100644
--- a/Editor/src/Lists.js
+++ b/Editor/src/Lists.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var Lists_increaseIndent;
var Lists_decreaseIndent;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/Main.js
----------------------------------------------------------------------
diff --git a/Editor/src/Main.js b/Editor/src/Main.js
index 98eccbf..f123423 100644
--- a/Editor/src/Main.js
+++ b/Editor/src/Main.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var Main_getLanguage;
var Main_setLanguage;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/Metadata.js
----------------------------------------------------------------------
diff --git a/Editor/src/Metadata.js b/Editor/src/Metadata.js
index 668c44e..fce4cca 100644
--- a/Editor/src/Metadata.js
+++ b/Editor/src/Metadata.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var Metadata_getMetadata;
var Metadata_setMetadata;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/NodeSet.js
----------------------------------------------------------------------
diff --git a/Editor/src/NodeSet.js b/Editor/src/NodeSet.js
index 00e63bc..77b7600 100644
--- a/Editor/src/NodeSet.js
+++ b/Editor/src/NodeSet.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
function NodeSet()
{
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/Outline.js
----------------------------------------------------------------------
diff --git a/Editor/src/Outline.js b/Editor/src/Outline.js
index 4d838df..e021d23 100644
--- a/Editor/src/Outline.js
+++ b/Editor/src/Outline.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
// FIXME: The TOC/ItemList stuff won't work with Undo, because we're making DOM mutations in
// response to other DOM mutations, so at undo time the changes will be made twice
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/Position.js
----------------------------------------------------------------------
diff --git a/Editor/src/Position.js b/Editor/src/Position.js
index 6af3c7b..7832835 100644
--- a/Editor/src/Position.js
+++ b/Editor/src/Position.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var Position;
var Position_assertValid;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/PostponedActions.js
----------------------------------------------------------------------
diff --git a/Editor/src/PostponedActions.js b/Editor/src/PostponedActions.js
index b63923f..d445536 100644
--- a/Editor/src/PostponedActions.js
+++ b/Editor/src/PostponedActions.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var PostponedActions_add;
var PostponedActions_perform;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/Preview.js
----------------------------------------------------------------------
diff --git a/Editor/src/Preview.js b/Editor/src/Preview.js
index 9267b3f..97f9bf1 100644
--- a/Editor/src/Preview.js
+++ b/Editor/src/Preview.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var Preview_showForStyle;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/Range.js
----------------------------------------------------------------------
diff --git a/Editor/src/Range.js b/Editor/src/Range.js
index 883bbdc..8d7c655 100644
--- a/Editor/src/Range.js
+++ b/Editor/src/Range.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var Range;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/Scan.js
----------------------------------------------------------------------
diff --git a/Editor/src/Scan.js b/Editor/src/Scan.js
index 88938a6..e6cf4f5 100644
--- a/Editor/src/Scan.js
+++ b/Editor/src/Scan.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var Scan_reset;
var Scan_next;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/Selection.js
----------------------------------------------------------------------
diff --git a/Editor/src/Selection.js b/Editor/src/Selection.js
index 42158f3..0f8e2dc 100644
--- a/Editor/src/Selection.js
+++ b/Editor/src/Selection.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
// FIXME: cursor does not display correctly if it is after a space at the end of the line
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/StringBuilder.js
----------------------------------------------------------------------
diff --git a/Editor/src/StringBuilder.js b/Editor/src/StringBuilder.js
index 9c7460c..9332b79 100644
--- a/Editor/src/StringBuilder.js
+++ b/Editor/src/StringBuilder.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
function StringBuilder()
{
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/Styles.js
----------------------------------------------------------------------
diff --git a/Editor/src/Styles.js b/Editor/src/Styles.js
index 232f3b0..c09f41d 100644
--- a/Editor/src/Styles.js
+++ b/Editor/src/Styles.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var Styles_getRule;
var Styles_nextSelectorAfter;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/Tables.js
----------------------------------------------------------------------
diff --git a/Editor/src/Tables.js b/Editor/src/Tables.js
index 153212c..d8e0874 100644
--- a/Editor/src/Tables.js
+++ b/Editor/src/Tables.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var Tables_insertTable;
var Tables_addAdjacentRow;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/Text.js
----------------------------------------------------------------------
diff --git a/Editor/src/Text.js b/Editor/src/Text.js
index 10a90b8..5a69feb 100644
--- a/Editor/src/Text.js
+++ b/Editor/src/Text.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var Text_findParagraphBoundaries;
var Text_analyseParagraph;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/UndoManager.js
----------------------------------------------------------------------
diff --git a/Editor/src/UndoManager.js b/Editor/src/UndoManager.js
index 44cb279..fcc9098 100644
--- a/Editor/src/UndoManager.js
+++ b/Editor/src/UndoManager.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
// FIXME: place a limit on the number of undo steps recorded - say, 30-50?
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/Viewport.js
----------------------------------------------------------------------
diff --git a/Editor/src/Viewport.js b/Editor/src/Viewport.js
index c78df45..47fbdfd 100644
--- a/Editor/src/Viewport.js
+++ b/Editor/src/Viewport.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var Viewport_init;
var Viewport_setViewportWidth;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/first.js
----------------------------------------------------------------------
diff --git a/Editor/src/first.js b/Editor/src/first.js
index 953ef4b..48cfd85 100644
--- a/Editor/src/first.js
+++ b/Editor/src/first.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
// FIXME: The _PREFIX variables below must be replaced with functions that return the
// appropriate namespace prefix for the document in question (since we can't rely on the
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/traversal.js
----------------------------------------------------------------------
diff --git a/Editor/src/traversal.js b/Editor/src/traversal.js
index 40227ea..439870f 100644
--- a/Editor/src/traversal.js
+++ b/Editor/src/traversal.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
function prevNode(node)
{
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/types.js
----------------------------------------------------------------------
diff --git a/Editor/src/types.js b/Editor/src/types.js
index 243f5e9..5e025d6 100644
--- a/Editor/src/types.js
+++ b/Editor/src/types.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var CONTAINER_ELEMENTS = new Array(HTML_COUNT);
CONTAINER_ELEMENTS[HTML_DOCUMENT] = true;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/util.js
----------------------------------------------------------------------
diff --git a/Editor/src/util.js b/Editor/src/util.js
index fbe23e4..191fc55 100644
--- a/Editor/src/util.js
+++ b/Editor/src/util.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
function arrayContains(array,value)
{
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/tests/PrettyPrinter.js
----------------------------------------------------------------------
diff --git a/Editor/tests/PrettyPrinter.js b/Editor/tests/PrettyPrinter.js
index c39e7e1..9fac5cf 100644
--- a/Editor/tests/PrettyPrinter.js
+++ b/Editor/tests/PrettyPrinter.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
(function() {
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/tests/autocorrect/AutoCorrectTests.js
----------------------------------------------------------------------
diff --git a/Editor/tests/autocorrect/AutoCorrectTests.js b/Editor/tests/autocorrect/AutoCorrectTests.js
index ba514bb..fdc771d 100644
--- a/Editor/tests/autocorrect/AutoCorrectTests.js
+++ b/Editor/tests/autocorrect/AutoCorrectTests.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
function findTextMatching(re)
{
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/tests/dom/RangeTest.js
----------------------------------------------------------------------
diff --git a/Editor/tests/dom/RangeTest.js b/Editor/tests/dom/RangeTest.js
index b182f63..2d69cc3 100644
--- a/Editor/tests/dom/RangeTest.js
+++ b/Editor/tests/dom/RangeTest.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var allPositions;
var allPositionsIndexMap;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/tests/figures/FiguresTest.js
----------------------------------------------------------------------
diff --git a/Editor/tests/figures/FiguresTest.js b/Editor/tests/figures/FiguresTest.js
index bae29c1..385017a 100644
--- a/Editor/tests/figures/FiguresTest.js
+++ b/Editor/tests/figures/FiguresTest.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
function figurePropertiesString(index)
{
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/tests/input/InputTests.js
----------------------------------------------------------------------
diff --git a/Editor/tests/input/InputTests.js b/Editor/tests/input/InputTests.js
index f81a14f..d745b86 100644
--- a/Editor/tests/input/InputTests.js
+++ b/Editor/tests/input/InputTests.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
function getNodeArrayText(nodes)
{
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/tests/outline/OutlineTest.js
----------------------------------------------------------------------
diff --git a/Editor/tests/outline/OutlineTest.js b/Editor/tests/outline/OutlineTest.js
index 130b5c1..587e82c 100644
--- a/Editor/tests/outline/OutlineTest.js
+++ b/Editor/tests/outline/OutlineTest.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
function createTestSections(topChildren)
{
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/tests/position/validPositions.js
----------------------------------------------------------------------
diff --git a/Editor/tests/position/validPositions.js b/Editor/tests/position/validPositions.js
index 4334774..e158d3f 100644
--- a/Editor/tests/position/validPositions.js
+++ b/Editor/tests/position/validPositions.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
function oldInsertCharacter(character)
{
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/tests/scan/ScanTests.js
----------------------------------------------------------------------
diff --git a/Editor/tests/scan/ScanTests.js b/Editor/tests/scan/ScanTests.js
index e039a14..15fb875 100644
--- a/Editor/tests/scan/ScanTests.js
+++ b/Editor/tests/scan/ScanTests.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
function testNext()
{
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/tests/selection/PositionTests.js
----------------------------------------------------------------------
diff --git a/Editor/tests/selection/PositionTests.js b/Editor/tests/selection/PositionTests.js
index 7367f9a..5b7810e 100644
--- a/Editor/tests/selection/PositionTests.js
+++ b/Editor/tests/selection/PositionTests.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
function pad(str,length)
{
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/tests/server.js
----------------------------------------------------------------------
diff --git a/Editor/tests/server.js b/Editor/tests/server.js
index 8946717..0e46945 100644
--- a/Editor/tests/server.js
+++ b/Editor/tests/server.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
function debug(str)
{
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/tests/tables/TableTests.js
----------------------------------------------------------------------
diff --git a/Editor/tests/tables/TableTests.js b/Editor/tests/tables/TableTests.js
index 5aab601..a8859e5 100644
--- a/Editor/tests/tables/TableTests.js
+++ b/Editor/tests/tables/TableTests.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
function showSelectedTableRegion()
{
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/tests/test-structure.html
----------------------------------------------------------------------
diff --git a/Editor/tests/test-structure.html b/Editor/tests/test-structure.html
index fef592c..9188155 100644
--- a/Editor/tests/test-structure.html
+++ b/Editor/tests/test-structure.html
@@ -1,5 +1,22 @@
<!DOCTYPE html>
-<!-- Copyright (c) 2011-2013 UX Productivity Pty Ltd. All rights reserved. -->
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<html>
<head>
<script type="text/javascript" src="../Outline_js"></script>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/tests/testharness.js
----------------------------------------------------------------------
diff --git a/Editor/tests/testharness.js b/Editor/tests/testharness.js
index 775ad79..3f7f8e6 100644
--- a/Editor/tests/testharness.js
+++ b/Editor/tests/testharness.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var topArea;
var leftArea;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/tests/testlib.js
----------------------------------------------------------------------
diff --git a/Editor/tests/testlib.js b/Editor/tests/testlib.js
index 0e20e7a..b2eb47f 100644
--- a/Editor/tests/testlib.js
+++ b/Editor/tests/testlib.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
function testHarnessSetup()
{
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/tests/text/TextTests.js
----------------------------------------------------------------------
diff --git a/Editor/tests/text/TextTests.js b/Editor/tests/text/TextTests.js
index 4fcd608..22a8305 100644
--- a/Editor/tests/text/TextTests.js
+++ b/Editor/tests/text/TextTests.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
function showRuns()
{
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/tests/undo/UndoTests.js
----------------------------------------------------------------------
diff --git a/Editor/tests/undo/UndoTests.js b/Editor/tests/undo/UndoTests.js
index 4118caf..6a6203c 100644
--- a/Editor/tests/undo/UndoTests.js
+++ b/Editor/tests/undo/UndoTests.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
function testUndo(versions,node)
{
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
new file mode 100644
index 0000000..89fa063
--- /dev/null
+++ b/NOTICE.txt
@@ -0,0 +1,7 @@
+Apache Corinthia (incubating)
+Copyright 2014-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes software copyright 2011-2015 UX Productivity Pty Ltd.
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/build/build_instructions.txt
----------------------------------------------------------------------
diff --git a/build/build_instructions.txt b/build/build_instructions.txt
deleted file mode 100644
index 4bd93b3..0000000
Binary files a/build/build_instructions.txt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/consumers/dfconvert/src/main.c
----------------------------------------------------------------------
diff --git a/consumers/dfconvert/src/main.c b/consumers/dfconvert/src/main.c
index b2bacb3..2d47e40 100644
--- a/consumers/dfconvert/src/main.c
+++ b/consumers/dfconvert/src/main.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include <DocFormats/DocFormats.h>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/consumers/dftest/src/main.c
----------------------------------------------------------------------
diff --git a/consumers/dftest/src/main.c b/consumers/dftest/src/main.c
index b3fd6b0..6324f02 100644
--- a/consumers/dftest/src/main.c
+++ b/consumers/dftest/src/main.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "DFUnitTest.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/consumers/dfutil/src/Commands.c
----------------------------------------------------------------------
diff --git a/consumers/dfutil/src/Commands.c b/consumers/dfutil/src/Commands.c
index 530acd2..4b74a49 100644
--- a/consumers/dfutil/src/Commands.c
+++ b/consumers/dfutil/src/Commands.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "Commands.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/consumers/dfutil/src/Commands.h
----------------------------------------------------------------------
diff --git a/consumers/dfutil/src/Commands.h b/consumers/dfutil/src/Commands.h
index 69b8912..93114a3 100644
--- a/consumers/dfutil/src/Commands.h
+++ b/consumers/dfutil/src/Commands.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef dfutil_Commands_h
#define dfutil_Commands_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/consumers/dfutil/src/FunctionTests.h
----------------------------------------------------------------------
diff --git a/consumers/dfutil/src/FunctionTests.h b/consumers/dfutil/src/FunctionTests.h
index f5a3238..5f2ee23 100644
--- a/consumers/dfutil/src/FunctionTests.h
+++ b/consumers/dfutil/src/FunctionTests.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef dfutil_FunctionTests_h
#define dfutil_FunctionTests_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/consumers/dfutil/src/FunctionTests.m
----------------------------------------------------------------------
diff --git a/consumers/dfutil/src/FunctionTests.m b/consumers/dfutil/src/FunctionTests.m
index 97d8312..037ac45 100644
--- a/consumers/dfutil/src/FunctionTests.m
+++ b/consumers/dfutil/src/FunctionTests.m
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#import <Foundation/Foundation.h>
#include "DFPlatform.h"
[19/33] incubator-corinthia git commit: Word: Remove warnings
parameters for conversion
Posted by ja...@apache.org.
Word: Remove warnings parameters for conversion
We've always treated warnings as errors, so we might as well disperse
with the idea of exposing a separate data structure to code that uses
WordConverter to record these.
The warnings buffer still exists for now; it's just internal to
WordConverter.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/bc6827f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/bc6827f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/bc6827f6
Branch: refs/heads/experiment64
Commit: bc6827f6130a8b04b3c97598c31d4cc7289a2ddb
Parents: 5c9a2c0
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Sun Jan 11 12:39:56 2015 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Sun Jan 11 12:39:56 2015 +0700
----------------------------------------------------------------------
DocFormats/filters/ooxml/src/word/Word.c | 12 +++---------
DocFormats/filters/ooxml/src/word/WordConverter.c | 13 ++++++-------
DocFormats/filters/ooxml/src/word/WordConverter.h | 4 ++--
3 files changed, 11 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/bc6827f6/DocFormats/filters/ooxml/src/word/Word.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/Word.c b/DocFormats/filters/ooxml/src/word/Word.c
index a94deaa..1e06448 100644
--- a/DocFormats/filters/ooxml/src/word/Word.c
+++ b/DocFormats/filters/ooxml/src/word/Word.c
@@ -27,7 +27,6 @@ DFDocument *WordGet(DFStorage *concreteStorage, DFStorage *abstractStorage, DFEr
{
int ok = 0;
WordPackage *wordPackage = NULL;
- DFBuffer *warnings = DFBufferNew();
DFDocument *htmlDoc = NULL;
wordPackage = WordPackageOpenFrom(concreteStorage,error);
@@ -35,13 +34,12 @@ DFDocument *WordGet(DFStorage *concreteStorage, DFStorage *abstractStorage, DFEr
goto end;
htmlDoc = DFDocumentNew();
- if (!WordConverterGet(htmlDoc,abstractStorage,"word",wordPackage,warnings,error))
+ if (!WordConverterGet(htmlDoc,abstractStorage,"word",wordPackage,error))
goto end;
ok = 1;
end:
- DFBufferRelease(warnings);
WordPackageRelease(wordPackage);
if (ok) {
return htmlDoc;
@@ -56,7 +54,6 @@ int WordPut(DFStorage *concreteStorage, DFStorage *abstractStorage, DFDocument *
{
int ok = 0;
WordPackage *wordPackage = NULL;
- DFBuffer *warnings = DFBufferNew();
const char *idPrefix = "word";
@@ -64,7 +61,7 @@ int WordPut(DFStorage *concreteStorage, DFStorage *abstractStorage, DFDocument *
if (wordPackage == NULL)
goto end;
- if (!WordConverterPut(htmlDoc,abstractStorage,idPrefix,wordPackage,warnings,error))
+ if (!WordConverterPut(htmlDoc,abstractStorage,idPrefix,wordPackage,error))
goto end;
if (!WordPackageSave(wordPackage,error))
@@ -74,7 +71,6 @@ int WordPut(DFStorage *concreteStorage, DFStorage *abstractStorage, DFDocument *
end:
WordPackageRelease(wordPackage);
- DFBufferRelease(warnings);
return ok;
}
@@ -82,7 +78,6 @@ int WordCreate(DFStorage *concreteStorage, DFStorage *abstractStorage, DFDocumen
{
int ok = 0;
WordPackage *wordPackage = NULL;
- DFBuffer *warnings = DFBufferNew();
const char *idPrefix = "word";
@@ -96,7 +91,7 @@ int WordCreate(DFStorage *concreteStorage, DFStorage *abstractStorage, DFDocumen
// a new word or odf file from it.
HTMLBreakBDTRefs(htmlDoc->docNode,idPrefix);
- if (!WordConverterPut(htmlDoc,abstractStorage,idPrefix,wordPackage,warnings,error))
+ if (!WordConverterPut(htmlDoc,abstractStorage,idPrefix,wordPackage,error))
goto end;
if (!WordPackageSave(wordPackage,error))
@@ -106,7 +101,6 @@ int WordCreate(DFStorage *concreteStorage, DFStorage *abstractStorage, DFDocumen
end:
WordPackageRelease(wordPackage);
- DFBufferRelease(warnings);
return ok;
}
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/bc6827f6/DocFormats/filters/ooxml/src/word/WordConverter.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordConverter.c b/DocFormats/filters/ooxml/src/word/WordConverter.c
index ee00253..f649d26 100644
--- a/DocFormats/filters/ooxml/src/word/WordConverter.c
+++ b/DocFormats/filters/ooxml/src/word/WordConverter.c
@@ -558,8 +558,7 @@ static void Word_postProcessHTMLDoc(WordConverter *conv)
////////////////////////////////////////////////////////////////////////////////////////////////////
static WordConverter *WordConverterNew(DFDocument *html, DFStorage *abstractStorage,
- const char *idPrefix, WordPackage *package,
- DFBuffer *warnings)
+ const char *idPrefix, WordPackage *package)
{
WordConverter *converter = (WordConverter *)calloc(1,sizeof(WordConverter));
converter->html = DFDocumentRetain(html);
@@ -582,7 +581,7 @@ static WordConverter *WordConverterNew(DFDocument *html, DFStorage *abstractStor
DFHashTableAdd(converter->supportedContentTypes,"gif","image/gif");
DFHashTableAdd(converter->supportedContentTypes,"bmp","image/bmp");
DFHashTableAdd(converter->supportedContentTypes,"png","image/png");
- converter->warnings = DFBufferRetain(warnings);
+ converter->warnings = DFBufferNew();
return converter;
}
@@ -722,9 +721,9 @@ static int WordConverterGet2(WordConverter *converter, DFError **error)
int WordConverterGet(DFDocument *html, DFStorage *abstractStorage,
const char *idPrefix, WordPackage *package,
- DFBuffer *warnings, DFError **error)
+ DFError **error)
{
- WordConverter *converter = WordConverterNew(html,abstractStorage,idPrefix,package,warnings);
+ WordConverter *converter = WordConverterNew(html,abstractStorage,idPrefix,package);
int ok = WordConverterGet2(converter,error);
WordConverterFree(converter);
return ok;
@@ -917,9 +916,9 @@ static int WordConverterPut2(WordConverter *converter, DFError **error)
int WordConverterPut(DFDocument *html, DFStorage *abstractStorage,
const char *idPrefix, WordPackage *package,
- DFBuffer *warnings, DFError **error)
+ DFError **error)
{
- WordConverter *converter = WordConverterNew(html,abstractStorage,idPrefix,package,warnings);
+ WordConverter *converter = WordConverterNew(html,abstractStorage,idPrefix,package);
int ok = WordConverterPut2(converter,error);
WordConverterFree(converter);
return ok;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/bc6827f6/DocFormats/filters/ooxml/src/word/WordConverter.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordConverter.h b/DocFormats/filters/ooxml/src/word/WordConverter.h
index eeed849..c0565f2 100644
--- a/DocFormats/filters/ooxml/src/word/WordConverter.h
+++ b/DocFormats/filters/ooxml/src/word/WordConverter.h
@@ -100,10 +100,10 @@ struct WordConverter {
int WordConverterGet(DFDocument *html, DFStorage *abstractStorage,
const char *idPrefix, WordPackage *package,
- DFBuffer *warnings, DFError **error);
+ DFError **error);
int WordConverterPut(DFDocument *html, DFStorage *abstractStorage,
const char *idPrefix, WordPackage *package,
- DFBuffer *warnings, DFError **error);
+ DFError **error);
void WordConverterWarning(WordConverter *converter, const char *format, ...) ATTRIBUTE_FORMAT(printf,2,3);
char *WordStyleIdForStyle(CSSStyle *style);
[09/33] incubator-corinthia git commit: Fix OS X build breakage in
DFError.h
Posted by ja...@apache.org.
Fix OS X build breakage in DFError.h
Commit e8d93d4 removed the ATTRIBUTE_FORMAT macro from DFError.h, since
this macro is also present in DFPlatform.h. However, DFError.h is part
of the public API, while DFPlatform is not. Consumers that are
configured to compile only against the public API are unable to access
macro definitions in DFPlatform.h, so those macros must be present in
the API headers.
The ATTRIBUTE_FORMAT is used for telling the compiler to check the
arguments to DFErrorFormat to make sure they conform to printf-style
formatting. GCC/Clang and Visual C++ both have a different syntax for
this, which is why a macro is needed.
I'm not sure why gcc on Linux and Visual C++ on windows weren't
complaining about this, but Xcode gave a compile error as the macro was
undefined.
If we want to avoid platform-specific #ifdefs in specific public header
files, we'll need something equivalent to DFPlatform.h which is included
in the public headers. Putting this #ifdef back as-is is a temporary
solution, needed to build the code under Xcode, but ultimately it would
be good if we could come up with a more general solution.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/cc208a6d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/cc208a6d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/cc208a6d
Branch: refs/heads/experiment64
Commit: cc208a6d44534fea95a5fa2f4bcc7f733b58fd89
Parents: 3f11aef
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Sun Jan 11 00:48:26 2015 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Sun Jan 11 00:52:52 2015 +0700
----------------------------------------------------------------------
DocFormats/api/headers/DocFormats/DFError.h | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/cc208a6d/DocFormats/api/headers/DocFormats/DFError.h
----------------------------------------------------------------------
diff --git a/DocFormats/api/headers/DocFormats/DFError.h b/DocFormats/api/headers/DocFormats/DFError.h
index 5b08fb1..2876007 100644
--- a/DocFormats/api/headers/DocFormats/DFError.h
+++ b/DocFormats/api/headers/DocFormats/DFError.h
@@ -19,6 +19,13 @@
// It's really not nice having this here, but is the only way to get the compiler to typecheck the
// DFErrorFormat arguments when such functionality is available.
+#ifndef ATTRIBUTE_FORMAT
+#ifdef _MSC_VER
+#define ATTRIBUTE_FORMAT(archetype,index,first)
+#else
+#define ATTRIBUTE_FORMAT(archetype,index,first) __attribute__((format(archetype,index,first)))
+#endif
+#endif
typedef struct DFError DFError;
[28/33] incubator-corinthia git commit: Update copyright notice
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordWhitespace.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordWhitespace.h b/DocFormats/filters/ooxml/src/word/WordWhitespace.h
index 5b9d1aa..97668b6 100644
--- a/DocFormats/filters/ooxml/src/word/WordWhitespace.h
+++ b/DocFormats/filters/ooxml/src/word/WordWhitespace.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordWhitespace_h
#define DocFormats_WordWhitespace_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/formatting/WordCommonPr.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/formatting/WordCommonPr.c b/DocFormats/filters/ooxml/src/word/formatting/WordCommonPr.c
index 0578e3b..7a88308 100644
--- a/DocFormats/filters/ooxml/src/word/formatting/WordCommonPr.c
+++ b/DocFormats/filters/ooxml/src/word/formatting/WordCommonPr.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordCommonPr.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/formatting/WordCommonPr.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/formatting/WordCommonPr.h b/DocFormats/filters/ooxml/src/word/formatting/WordCommonPr.h
index 44d6707..0b5fdba 100644
--- a/DocFormats/filters/ooxml/src/word/formatting/WordCommonPr.h
+++ b/DocFormats/filters/ooxml/src/word/formatting/WordCommonPr.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordCommonPr_h
#define DocFormats_WordCommonPr_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/formatting/WordNumPr.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/formatting/WordNumPr.c b/DocFormats/filters/ooxml/src/word/formatting/WordNumPr.c
index 21d0deb..ce96251 100644
--- a/DocFormats/filters/ooxml/src/word/formatting/WordNumPr.c
+++ b/DocFormats/filters/ooxml/src/word/formatting/WordNumPr.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordNumPr.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/formatting/WordNumPr.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/formatting/WordNumPr.h b/DocFormats/filters/ooxml/src/word/formatting/WordNumPr.h
index 5ccbbbf..93ce768 100644
--- a/DocFormats/filters/ooxml/src/word/formatting/WordNumPr.h
+++ b/DocFormats/filters/ooxml/src/word/formatting/WordNumPr.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordNumPr_h
#define DocFormats_WordNumPr_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/formatting/WordPPr.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/formatting/WordPPr.c b/DocFormats/filters/ooxml/src/word/formatting/WordPPr.c
index a40da92..022ba5e 100644
--- a/DocFormats/filters/ooxml/src/word/formatting/WordPPr.c
+++ b/DocFormats/filters/ooxml/src/word/formatting/WordPPr.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordPPr.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/formatting/WordPPr.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/formatting/WordPPr.h b/DocFormats/filters/ooxml/src/word/formatting/WordPPr.h
index 6572992..4961bce 100644
--- a/DocFormats/filters/ooxml/src/word/formatting/WordPPr.h
+++ b/DocFormats/filters/ooxml/src/word/formatting/WordPPr.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordPPr_h
#define DocFormats_WordPPr_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/formatting/WordRPr.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/formatting/WordRPr.c b/DocFormats/filters/ooxml/src/word/formatting/WordRPr.c
index 551d145..a2f13a1 100644
--- a/DocFormats/filters/ooxml/src/word/formatting/WordRPr.c
+++ b/DocFormats/filters/ooxml/src/word/formatting/WordRPr.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordRPr.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/formatting/WordRPr.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/formatting/WordRPr.h b/DocFormats/filters/ooxml/src/word/formatting/WordRPr.h
index 376eba4..487c5d8 100644
--- a/DocFormats/filters/ooxml/src/word/formatting/WordRPr.h
+++ b/DocFormats/filters/ooxml/src/word/formatting/WordRPr.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordRPr_h
#define DocFormats_WordRPr_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/formatting/WordTblPr.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/formatting/WordTblPr.c b/DocFormats/filters/ooxml/src/word/formatting/WordTblPr.c
index bb398b3..d173ec0 100644
--- a/DocFormats/filters/ooxml/src/word/formatting/WordTblPr.c
+++ b/DocFormats/filters/ooxml/src/word/formatting/WordTblPr.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordTblPr.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/formatting/WordTblPr.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/formatting/WordTblPr.h b/DocFormats/filters/ooxml/src/word/formatting/WordTblPr.h
index a394dc6..a2a1926 100644
--- a/DocFormats/filters/ooxml/src/word/formatting/WordTblPr.h
+++ b/DocFormats/filters/ooxml/src/word/formatting/WordTblPr.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordTblPr_h
#define DocFormats_WordTblPr_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/lenses/WordBlockLevel.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordBlockLevel.c b/DocFormats/filters/ooxml/src/word/lenses/WordBlockLevel.c
index fe71ff2..c7857ae 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordBlockLevel.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordBlockLevel.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordLenses.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/lenses/WordBody.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordBody.c b/DocFormats/filters/ooxml/src/word/lenses/WordBody.c
index 6c8b92f..a1f920e 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordBody.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordBody.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordLenses.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/lenses/WordBookmark.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordBookmark.c b/DocFormats/filters/ooxml/src/word/lenses/WordBookmark.c
index fcd2f53..a82756e 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordBookmark.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordBookmark.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "WordBookmark.h"
#include "WordLenses.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/lenses/WordBookmark.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordBookmark.h b/DocFormats/filters/ooxml/src/word/lenses/WordBookmark.h
index 18f2d87..ce66df4 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordBookmark.h
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordBookmark.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordBookmark_h
#define DocFormats_WordBookmark_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/lenses/WordChange.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordChange.c b/DocFormats/filters/ooxml/src/word/lenses/WordChange.c
index 484131c..861706a 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordChange.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordChange.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordLenses.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/lenses/WordDocument.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordDocument.c b/DocFormats/filters/ooxml/src/word/lenses/WordDocument.c
index 8c2ce78..01bb883 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordDocument.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordDocument.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordLenses.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/lenses/WordDrawing.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordDrawing.c b/DocFormats/filters/ooxml/src/word/lenses/WordDrawing.c
index 0d53286..f737868 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordDrawing.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordDrawing.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordDrawing.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/lenses/WordDrawing.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordDrawing.h b/DocFormats/filters/ooxml/src/word/lenses/WordDrawing.h
index 6b8b5a3..c10c661 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordDrawing.h
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordDrawing.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordDrawing_h
#define DocFormats_WordDrawing_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/lenses/WordEquation.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordEquation.c b/DocFormats/filters/ooxml/src/word/lenses/WordEquation.c
index d56b9e2..79694b3 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordEquation.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordEquation.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordLenses.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/lenses/WordField.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordField.c b/DocFormats/filters/ooxml/src/word/lenses/WordField.c
index 9235a45..1f356a6 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordField.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordField.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordField.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/lenses/WordField.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordField.h b/DocFormats/filters/ooxml/src/word/lenses/WordField.h
index a2c2e74..3b5647b 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordField.h
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordField.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordField_h
#define DocFormats_WordField_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/lenses/WordHyperlink.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordHyperlink.c b/DocFormats/filters/ooxml/src/word/lenses/WordHyperlink.c
index 7d19742..00ee642 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordHyperlink.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordHyperlink.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordLenses.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/lenses/WordLenses.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordLenses.c b/DocFormats/filters/ooxml/src/word/lenses/WordLenses.c
index 2137762..994f45a 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordLenses.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordLenses.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordLenses.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/lenses/WordLenses.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordLenses.h b/DocFormats/filters/ooxml/src/word/lenses/WordLenses.h
index 0337bea..fd13d5f 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordLenses.h
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordLenses.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordLenses_h
#define DocFormats_WordLenses_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/lenses/WordParagraph.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordParagraph.c b/DocFormats/filters/ooxml/src/word/lenses/WordParagraph.c
index 0a836d0..8c02fc5 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordParagraph.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordParagraph.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordLenses.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/lenses/WordParagraphContent.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordParagraphContent.c b/DocFormats/filters/ooxml/src/word/lenses/WordParagraphContent.c
index 19e86f2..5bc9e57 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordParagraphContent.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordParagraphContent.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordLenses.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/lenses/WordRun.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordRun.c b/DocFormats/filters/ooxml/src/word/lenses/WordRun.c
index 86b21be..9496dba 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordRun.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordRun.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordLenses.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/lenses/WordRunContent.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordRunContent.c b/DocFormats/filters/ooxml/src/word/lenses/WordRunContent.c
index 784e145..0cc5a09 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordRunContent.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordRunContent.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordLenses.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/lenses/WordSmartTag.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordSmartTag.c b/DocFormats/filters/ooxml/src/word/lenses/WordSmartTag.c
index 5f527d0..df74119 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordSmartTag.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordSmartTag.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordLenses.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/lenses/WordTable.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordTable.c b/DocFormats/filters/ooxml/src/word/lenses/WordTable.c
index 36f51d5..b84ce7e 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordTable.c
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordTable.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordLenses.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/tests/word/WordPlain.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/tests/word/WordPlain.c b/DocFormats/filters/ooxml/tests/word/WordPlain.c
index 9857817..2498418 100644
--- a/DocFormats/filters/ooxml/tests/word/WordPlain.c
+++ b/DocFormats/filters/ooxml/tests/word/WordPlain.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordPlain.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/tests/word/WordPlain.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/tests/word/WordPlain.h b/DocFormats/filters/ooxml/tests/word/WordPlain.h
index 8b44911..93bafb9 100644
--- a/DocFormats/filters/ooxml/tests/word/WordPlain.h
+++ b/DocFormats/filters/ooxml/tests/word/WordPlain.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordPlain_h
#define DocFormats_WordPlain_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/tests/word/WordTests.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/tests/word/WordTests.c b/DocFormats/filters/ooxml/tests/word/WordTests.c
index 270403d..5c157b3 100644
--- a/DocFormats/filters/ooxml/tests/word/WordTests.c
+++ b/DocFormats/filters/ooxml/tests/word/WordTests.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "DFUnitTest.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/headers/DFCommon.h
----------------------------------------------------------------------
diff --git a/DocFormats/headers/DFCommon.h b/DocFormats/headers/DFCommon.h
index 27b3e5c..e9e8f10 100644
--- a/DocFormats/headers/DFCommon.h
+++ b/DocFormats/headers/DFCommon.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFCommon_h
#define DocFormats_DFCommon_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/headers/DFCore.h
----------------------------------------------------------------------
diff --git a/DocFormats/headers/DFCore.h b/DocFormats/headers/DFCore.h
index 3505038..8355bd3 100644
--- a/DocFormats/headers/DFCore.h
+++ b/DocFormats/headers/DFCore.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFCore_h
#define DocFormats_DFCore_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/headers/DFPlatform.h
----------------------------------------------------------------------
diff --git a/DocFormats/headers/DFPlatform.h b/DocFormats/headers/DFPlatform.h
index ea517e7..87a3fda 100755
--- a/DocFormats/headers/DFPlatform.h
+++ b/DocFormats/headers/DFPlatform.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFPlatform_h
#define DocFormats_DFPlatform_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/headers/DFTypes.h
----------------------------------------------------------------------
diff --git a/DocFormats/headers/DFTypes.h b/DocFormats/headers/DFTypes.h
index 3b563c0..ef63766 100644
--- a/DocFormats/headers/DFTypes.h
+++ b/DocFormats/headers/DFTypes.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFTypes_h
#define DocFormats_DFTypes_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/unittest/DFUnitTest.c
----------------------------------------------------------------------
diff --git a/DocFormats/unittest/DFUnitTest.c b/DocFormats/unittest/DFUnitTest.c
index 65a47d9..37c2100 100644
--- a/DocFormats/unittest/DFUnitTest.c
+++ b/DocFormats/unittest/DFUnitTest.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFUnitTest.h"
#include <stdio.h>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/unittest/DFUnitTest.h
----------------------------------------------------------------------
diff --git a/DocFormats/unittest/DFUnitTest.h b/DocFormats/unittest/DFUnitTest.h
index 08b1729..1a24d46 100644
--- a/DocFormats/unittest/DFUnitTest.h
+++ b/DocFormats/unittest/DFUnitTest.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFUnitTest_h
#define DocFormats_DFUnitTest_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/AutoCorrect.js
----------------------------------------------------------------------
diff --git a/Editor/src/AutoCorrect.js b/Editor/src/AutoCorrect.js
index 7bb0783..a80e17d 100644
--- a/Editor/src/AutoCorrect.js
+++ b/Editor/src/AutoCorrect.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var AutoCorrect_init;
var AutoCorrect_removeListeners;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/ChangeTracking.js
----------------------------------------------------------------------
diff --git a/Editor/src/ChangeTracking.js b/Editor/src/ChangeTracking.js
index 9704b17..ba25a44 100644
--- a/Editor/src/ChangeTracking.js
+++ b/Editor/src/ChangeTracking.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var ChangeTracking_showChanges;
var ChangeTracking_trackChanges;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/Clipboard.js
----------------------------------------------------------------------
diff --git a/Editor/src/Clipboard.js b/Editor/src/Clipboard.js
index a0c5381..03efdcc 100644
--- a/Editor/src/Clipboard.js
+++ b/Editor/src/Clipboard.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var Markdown_htmlToMarkdown;
var Clipboard_htmlToText;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/Cursor.js
----------------------------------------------------------------------
diff --git a/Editor/src/Cursor.js b/Editor/src/Cursor.js
index 606c4bd..3ef60cc 100644
--- a/Editor/src/Cursor.js
+++ b/Editor/src/Cursor.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var Cursor_ensurePositionVisible;
var Cursor_ensureCursorVisible;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/DOM.js
----------------------------------------------------------------------
diff --git a/Editor/src/DOM.js b/Editor/src/DOM.js
index 723f20e..b2371bc 100644
--- a/Editor/src/DOM.js
+++ b/Editor/src/DOM.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
// Helper functions
var DOM_assignNodeIds;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/Editor/src/Editor.js
----------------------------------------------------------------------
diff --git a/Editor/src/Editor.js b/Editor/src/Editor.js
index 88a6ce2..50f0d21 100644
--- a/Editor/src/Editor.js
+++ b/Editor/src/Editor.js
@@ -1,16 +1,19 @@
-// Copyright 2011-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var Editor_getBackMessages;
var Editor_debug;
[15/33] incubator-corinthia git commit: Word: Make conversion
function names consistent
Posted by ja...@apache.org.
Word: Make conversion function names consistent
WordConverterUpdateFromHTML -> WordConverterPut
WordConverterConvertToHTML -> WordConverterGet
WordPackageUpdateFromHTML -> WordPackagePut
WordPackageGenerateHTML -> WordPackageGet
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/474eb4ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/474eb4ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/474eb4ca
Branch: refs/heads/experiment64
Commit: 474eb4caeb29f2353a0fadeef3f5a6bd8bc3b5ee
Parents: db23077
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Sun Jan 11 03:39:06 2015 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Sun Jan 11 03:39:06 2015 +0700
----------------------------------------------------------------------
DocFormats/filters/ooxml/src/word/Word.c | 6 +++---
DocFormats/filters/ooxml/src/word/WordConverter.c | 4 ++--
DocFormats/filters/ooxml/src/word/WordConverter.h | 4 ++--
DocFormats/filters/ooxml/src/word/WordPackage.c | 8 ++++----
DocFormats/filters/ooxml/src/word/WordPackage.h | 4 ++--
5 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/474eb4ca/DocFormats/filters/ooxml/src/word/Word.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/Word.c b/DocFormats/filters/ooxml/src/word/Word.c
index e17387d..5e977e7 100644
--- a/DocFormats/filters/ooxml/src/word/Word.c
+++ b/DocFormats/filters/ooxml/src/word/Word.c
@@ -34,7 +34,7 @@ DFDocument *WordGet(DFStorage *concreteStorage, DFStorage *abstractStorage, DFEr
if (wordPackage == NULL)
goto end;
- htmlDoc = WordPackageGenerateHTML(wordPackage,abstractStorage,"word",error,warnings);
+ htmlDoc = WordPackageGet(wordPackage,abstractStorage,"word",error,warnings);
if (htmlDoc == NULL)
goto end;
@@ -71,7 +71,7 @@ int WordPut(DFStorage *concreteStorage, DFStorage *abstractStorage, DFDocument *
if (wordPackage == NULL)
goto end;
- if (!WordPackageUpdateFromHTML(wordPackage,htmlDoc,abstractStorage,idPrefix,error,warnings))
+ if (!WordPackagePut(wordPackage,htmlDoc,abstractStorage,idPrefix,error,warnings))
goto end;
if (warnings->len > 0) {
@@ -108,7 +108,7 @@ int WordCreate(DFStorage *concreteStorage, DFStorage *abstractStorage, DFDocumen
// a new word or odf file from it.
HTMLBreakBDTRefs(htmlDoc->docNode,idPrefix);
- if (!WordPackageUpdateFromHTML(wordPackage,htmlDoc,abstractStorage,idPrefix,error,warnings))
+ if (!WordPackagePut(wordPackage,htmlDoc,abstractStorage,idPrefix,error,warnings))
goto end;
if (warnings->len > 0) {
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/474eb4ca/DocFormats/filters/ooxml/src/word/WordConverter.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordConverter.c b/DocFormats/filters/ooxml/src/word/WordConverter.c
index 5e3a2fa..b0cfd09 100644
--- a/DocFormats/filters/ooxml/src/word/WordConverter.c
+++ b/DocFormats/filters/ooxml/src/word/WordConverter.c
@@ -674,7 +674,7 @@ DFNode *WordConverterGetConcrete(WordPutData *put, DFNode *abstract)
return node;
}
-int WordConverterConvertToHTML(WordConverter *converter, DFError **error)
+int WordConverterGet(WordConverter *converter, DFError **error)
{
converter->haveFields = Word_simplifyFields(converter->package);
Word_mergeRuns(converter->package);
@@ -796,7 +796,7 @@ static void addMissingDefaultStyles(WordConverter *converter)
}
}
-int WordConverterUpdateFromHTML(WordConverter *converter, DFError **error)
+int WordConverterPut(WordConverter *converter, DFError **error)
{
if (converter->package->document == NULL) {
DFErrorFormat(error,"document.xml not found");
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/474eb4ca/DocFormats/filters/ooxml/src/word/WordConverter.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordConverter.h b/DocFormats/filters/ooxml/src/word/WordConverter.h
index cd31e68..b4accad 100644
--- a/DocFormats/filters/ooxml/src/word/WordConverter.h
+++ b/DocFormats/filters/ooxml/src/word/WordConverter.h
@@ -103,8 +103,8 @@ WordConverter *WordConverterNew(DFDocument *html, DFStorage *abstractStorage,
DFBuffer *warnings);
void WordConverterFree(WordConverter *converter);
-int WordConverterConvertToHTML(WordConverter *converter, DFError **error);
-int WordConverterUpdateFromHTML(WordConverter *converter, DFError **error);
+int WordConverterGet(WordConverter *converter, DFError **error);
+int WordConverterPut(WordConverter *converter, DFError **error);
void WordConverterWarning(WordConverter *converter, const char *format, ...) ATTRIBUTE_FORMAT(printf,2,3);
char *WordStyleIdForStyle(CSSStyle *style);
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/474eb4ca/DocFormats/filters/ooxml/src/word/WordPackage.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordPackage.c b/DocFormats/filters/ooxml/src/word/WordPackage.c
index 86b3bed..994eca5 100644
--- a/DocFormats/filters/ooxml/src/word/WordPackage.c
+++ b/DocFormats/filters/ooxml/src/word/WordPackage.c
@@ -383,25 +383,25 @@ int WordPackageSave(WordPackage *package, DFError **error)
return 1;
}
-DFDocument *WordPackageGenerateHTML(WordPackage *package, DFStorage *abstractStorage, const char *idPrefix,
+DFDocument *WordPackageGet(WordPackage *package, DFStorage *abstractStorage, const char *idPrefix,
DFError **error, DFBuffer *warnings)
{
DFDocument *html = DFDocumentNew();
WordConverter *converter = WordConverterNew(html,abstractStorage,idPrefix,package,warnings);
- int ok = WordConverterConvertToHTML(converter,error);
+ int ok = WordConverterGet(converter,error);
WordConverterFree(converter);
if (!ok)
return 0;
return html;
}
-int WordPackageUpdateFromHTML(WordPackage *package, DFDocument *input, DFStorage *abstractStorage,
+int WordPackagePut(WordPackage *package, DFDocument *input, DFStorage *abstractStorage,
const char *idPrefix, DFError **error, DFBuffer *warnings)
{
HTML_normalizeDocument(input);
HTML_pushDownInlineProperties(input->docNode);
WordConverter *converter = WordConverterNew(input,abstractStorage,idPrefix,package,warnings);
- int ok = WordConverterUpdateFromHTML(converter,error);
+ int ok = WordConverterPut(converter,error);
WordConverterFree(converter);
if (!ok)
return 0;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/474eb4ca/DocFormats/filters/ooxml/src/word/WordPackage.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordPackage.h b/DocFormats/filters/ooxml/src/word/WordPackage.h
index e074c5e..31f8457 100644
--- a/DocFormats/filters/ooxml/src/word/WordPackage.h
+++ b/DocFormats/filters/ooxml/src/word/WordPackage.h
@@ -58,9 +58,9 @@ void WordPackageExpandBookmarks(WordPackage *package);
WordPackage *WordPackageOpenNew(DFStorage *storage, DFError **error);
WordPackage *WordPackageOpenFrom(DFStorage *storage, DFError **error);
int WordPackageSave(WordPackage *package, DFError **error);
-DFDocument *WordPackageGenerateHTML(WordPackage *package, DFStorage *abstractStorage, const char *idPrefix,
+DFDocument *WordPackageGet(WordPackage *package, DFStorage *abstractStorage, const char *idPrefix,
DFError **error, DFBuffer *warnings);
-int WordPackageUpdateFromHTML(WordPackage *package, DFDocument *input, DFStorage *abstractStorage,
+int WordPackagePut(WordPackage *package, DFDocument *input, DFStorage *abstractStorage,
const char *idPrefix, DFError **error, DFBuffer *warnings);
#endif
[06/33] incubator-corinthia git commit: Completed External
Downloading Description
Posted by ja...@apache.org.
Completed External Downloading Description
Additional description files are provided to guide the running and the
maintenance of the Windows procedures.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/2d963742
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/2d963742
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/2d963742
Branch: refs/heads/experiment64
Commit: 2d963742473b25462502b491a1bd67d6b2097f66
Parents: 40fb232
Author: Dennis Hamilton <or...@apache.org>
Authored: Thu Jan 8 19:23:32 2015 -0800
Committer: Dennis Hamilton <or...@apache.org>
Committed: Thu Jan 8 19:23:32 2015 -0800
----------------------------------------------------------------------
external/README.txt | 117 +++++++++++++++++++------
external/customize.txt | 110 ++++++++++++++++++++++++
external/external.txt | 76 +++++++++++++++++
external/extract_downloads.bat | 16 ++--
external/fetch_downloads.bat | 15 ++--
external/maintenance.txt | 166 ++++++++++++++++++++++++++++++++++++
6 files changed, 461 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/2d963742/external/README.txt
----------------------------------------------------------------------
diff --git a/external/README.txt b/external/README.txt
index 2dc9a6b..efbbfb4 100644
--- a/external/README.txt
+++ b/external/README.txt
@@ -1,24 +1,24 @@
-README.txt 1.0 UTF-8
+README.txt 1.1.0 UTF-8
- EXTERNAL DOWNLOADS AREA STRUCTURE
- =================================
+ EXTERNAL DOWNLOADS SETUP AND USE
+ ================================
The Corinthia repository external/ area is a section of the repository used
for downloading external dependencies required in constructing Corinthia code.
These dependencies are required when constructing Corinthia components on and
for Microsoft Windows.
-The downloads are created in an externals/download/ subdirectory. This is
+The downloads are created in an externals\download\ subdirectory. This is
not part of the repository and is created in a local working copy whenever
-needed. The scripts in externals/ provide the necessary downloading and
+needed. The scripts in externals\ provide the necessary downloading and
organization of the external material.
-The files directly in externals/ level provide documentation and scripts for
+The files directly in externals\ level provide documentation and scripts for
carrying out the download and extraction of material that Corinthia components
depend on for their compilation and executable operation. These files are
part of the Corinthia source code repository and are maintained with it.
-There are two uses for the externals/ source code,
+There are two uses for the externals\ source code,
1. as maintained scripts for downloading the current dependencies into
the download/ folder in a form that is used by build procedures where
@@ -29,6 +29,35 @@ There are two uses for the externals/ source code,
needed on Microsoft Windows.
+ CONTENT
+ 1. Prerequisites for Using the Scripts
+ 2. Operation
+ 3. Compile-Time Dependency on the External/Download Content
+ 4. External Files to be Included with Corinthia Software on Windows
+ 5. Maintenance and Customization Procedures
+ 6. Caveats
+
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
1. PREREQUISITES FOR USING THE SCRIPTS
-----------------------------------
@@ -40,72 +69,80 @@ operating system can be either x86 or x64 based.
The procedures employ Microsoft Windows batch (.bat) files and rely on the
Windows Scripting Host (WSH) for JScript access to Windows utility functions.
+The Windows Command Extensions must be in effect. (These are usually set by
+default and Visual Studio scripts depend on them also.)
-The scripts can be executed using a Windows Shell of the user's choice. They
+The scripts can be executed using a console shell of the user's choice. They
have been tested using Windows cmd.exe, Windows PowerShell, MSYS2 (bash),
CygWin (bash) and JSoft Take Command (formerly 4NT and 4DOS). They have been
-operated on Windows 8.1 Pro and Windows 10 Technical Preview as of January,
-2015.
+operated on Windows XP, Windows 8.1 Pro x64 and Windows 10 x64 Technical
+Preview as of January, 2015.
+
2. OPERATION
---------
In a console session, simply arrange to execute the script
- external/extract_downloads.bat
+ external\extract_downloads.bat
wherever it is located on the local system. The other script files are used
-as needed to complete the extraction operations.
+as needed to complete the extraction operations. The script will operate
+relative to its own location, not where it is executed from. That is,
+the downloads\ sub-folder is always created in the same folder that holds
+extract_downloads.bat and the other scripts.
-The external/download/ folder will be created if needed. Any external package
+The external\download\ folder will be created if needed. Any external package
that is not yet downloaded will be fetched from the Internet. Already-
downloaded packages will not be downloaded again. (To force a fresh set of
-downloads, simply delete the download/ subfolder.)
+downloads, simply delete the download\ subfolder.)
-The external packages will be stored in external/downloads/ and will remain
+The external packages will be stored in external\downloads\ and will remain
there for any future use so long as that folder is preserved.
If the set of external packages is complete, they will then be expanded into
-download/include/, download/lib/, and download/bin/ subdirectories with the
+download\include\, download\lib\, and download\bin\ subdirectories with the
files needed for compilation and execution of code that relies on the external
dependencies.
-This extraction is done completely whenever extract_downloads is operated. It
-will not be performed if not all of the package downloads have succeeded.
+This extraction is done completely each time extract_downloads is operated.
+Extraction is not performed if any of the package downloads are missing.
3. COMPILE-TIME DEPENDENCY ON THE EXTERNAL/DOWNLOAD CONTENT
--------------------------------------------------------
-The population of external/downloads/ is presumed in the root CMakeLists.txt
+The population of external\downloads\ is presumed in the root CMakeLists.txt
file in the 'if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")' entry. That
definition and the current structure here must be kept synchronized.
-These externals are for builds targetted to Win32 x86 runtime only. Externals
+These externals are for builds targeted to Win32 x86 runtime only. Externals
needed for producing x64 executables require a different arrangement.
4. EXTERNAL FILES TO BE INCLUDED WITH CORINTHIA SOFTWARE ON WINDOWS
----------------------------------------------------------------
-The external/download/ folder is populated with include/, lib/, and bin/
+The external\download\ folder is populated with include\, lib\, and bin\
subfolders that carry extracted material that Corinthia code depends on when
compiled for Windows.
The compiled executables will need to be installed in folders that also have
-copies of DLLs from external/download/bin/
+copies of DLLs from external\download\bin\
- SDL2.dll
- SDL2_image.dll
iconv.dll
+ exit
libjpeg-9.dll
libpng16-16.dll
libtiff-5.dll
libwebp-4.dll
libxml2.dll
+ SDL2.dll
+ SDL2_image.dll
zlib1.dll
-The license files in bin/ should be carried along with those DLL files.
+The license files in bin\ are to be carried along with the DLL files they
+apply to.
Not every Corinthia component requires all of these DLLs. For finer details,
consult information on the individual component.
@@ -114,6 +151,34 @@ consult information on the individual component.
5. MAINTENANCE AND CUSTOMIZATION PROCEDURES
----------------------------------------
- [TBD]
+ The file maintenance.txt provides more information on how to perform
+ basic maintenance on these procedures.
+
+ The file customize.txt provides more information on adaptation of
+ the procedures for use in a differen location and download situation.
+
+ 6. CAVEATS
+ -------
+
+ The Windows Command Extensions must be enabled for the .bat scripts to
+ work properly.
+
+ The Windows file system is case insensitive. Any two file names and URLs
+ that differ only in case will collide. There are also more restrictions
+ on special characters. E.g., ":" may not be used in file names and "\"
+ is the path separator (not "/" which is also restricted).
+
+ The scripts can be unsuccessful without any failure indication. It is
+ necessary to use troubleshooting procedures to confirm that a download
+ is failing or that an extraction is not producing the expected content.
+ It is possible for a download to fail with a delivered but incorrect
+ file.
+
+
+REVISIONS
+
+ 1.1.0 2015-01-08-21:20 Updated Draft with complete coverage
+ 1.0.0 2015-01-08-15:21 Initial Draft replacement of the original README.txt
+
*** end of README.txt ***
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/2d963742/external/customize.txt
----------------------------------------------------------------------
diff --git a/external/customize.txt b/external/customize.txt
new file mode 100644
index 0000000..cb98e2f
--- /dev/null
+++ b/external/customize.txt
@@ -0,0 +1,110 @@
+customize.txt 1.0.0 UTF-8 2015-01-08
+
+ CUSTOMIZING EXTERNAL DOWNLOADS FOR OTHER DOWNLOADS
+ ==================================================
+
+ The external\ folder holds scripts and the download\ sub-folder for
+ external software that Corinthia Windows Win32 x86 builds depend on.
+
+ Note: This repository folder is intended to be usable when cloned to a
+ Microsoft platform. The notation for file paths reflects that, even
+ though POSIX path notation is used in the git and when viewed on GitHub.
+
+BASIC CUSTOMIZATION APPROACH
+
+The files, listed below, can be moved in their entirety to a new folder
+location where download of external materials is desired.
+
+The scripts are designed to operate relative to where they are stored. So
+if the scripts are moved to a folder named test-documents\, they will produce
+and populate a further sub-folder, either named download\ or a different name
+that is customized.
+
+One can make further modifications that deviate further from this structure.
+It is useful to make such changes in stages to ensure that the new organiza-
+tion is being honored correctly.
+
+Once the eight files are moved to their intended new home, customization at
+the detail is similar to following the maintenance procedure with allowance
+for the changes in location and desired operation.
+
+FILES TO MODIFY
+
+ .gitignore
+ Change the name of the download\ subfolder here if a different
+ folder outside of the managed source tree is used.
+
+ fetch_downloads.bat
+ The "download" name must be replaced everywhere that a different
+ folder name is to be used as the location of downloaded files. The
+ number of downloads and the names will also be changed by creation
+ of appropriate :FETCH calls in place of the ones in the script.
+
+ extract_downloads.bat
+ The "download" name must be replaced everywhere that a different
+ folder name is to be used as the location of the downloaded files
+ and of the new directories created as part of the extraction. Note
+ that all extractions of Zips are into a subfolder "T\" and then the
+ extracts are selectively moved to other places in the chosen download\
+ location. This procedure requires the greatest customization
+ depending on the purpose of the download procedure.
+
+ README.txt
+ replace with appropriate text, if needed at all.
+
+ customize.txt
+ this file can be kept unchanged or touched-up slightly for the new
+ location. Alternatively, simply refer to the originals that were
+ customized, linking to where this procedure was found.
+
+ maintenance.txt
+ This can still apply, depending on how much difference there is,
+ especially in the extraction process. Most of the advice remains
+ applicable.
+
+ unzip-win.js
+ This helper script takes the archive filename and the destination
+ folder as parameters. It does not need to be modified.
+
+ wget-win.js
+ This helper script takes the URL and the download location as
+ parameters. It does not need to be modified.
+
+
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+TODO
+
+ * Add maintainance.txt for the maintenance procedure for the scripts in their
+ original external\ portion of the Corinthia repository.
+
+ * Add customize.txt for the procedure for customizing the scripts in another
+ location or project.
+
+ * Update README.txt to reflect these when present.
+
+ * Add Apache license notice to anything of much length.
+
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+ 1.0.0 2015-01-08-16:48 Create initial version to account for the way
+ the scripts will produce different download folders in other places.
+
+ *** end of customize.txt ***
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/2d963742/external/external.txt
----------------------------------------------------------------------
diff --git a/external/external.txt b/external/external.txt
new file mode 100644
index 0000000..4846554
--- /dev/null
+++ b/external/external.txt
@@ -0,0 +1,76 @@
+external.txt 1.0.0 UTF-8 2015-01-08
+
+ CORINTHIA EXTERNAL DOWNLOADS FOR WINDOWS x86 BUILDS
+ ===================================================
+
+ The external\ folder holds scripts and the download\ sub-folder for
+ external software that Corinthia Windows Win32 x86 builds depend on.
+
+ Note: This repository folder is intended to be usable when cloned to a
+ Microsoft platform. The notation for file paths reflects that, even
+ though POSIX path notation is used in the git and when viewed on GitHub.
+
+
+MANIFEST
+
+ external.txt
+ This summary, manifest and work-item file for activity in this
+ external folder
+
+ .gitignore
+ Rule for excluding the download\ subfolder from the repository
+
+ extract_downloads.bat
+ Windows console session batch file for fetching and extracting
+ the external packages
+
+ fetch_downloads.bat
+ Windows console session batch file for fetching the external
+ packages to download\ without extracting anything; used by
+ extract_downloads to retrieve any packages not downloaded yet
+
+ README.txt
+ general description of the procedures and their usage
+
+ customize.txt
+ description of general procedure for customizing the procedures
+ in creating downloads on Windows for other purposes
+
+ maintenance.txt
+ description of the basic maintenance and modification-testing when
+ these procedures are updated and/or customized
+
+ unzip-win.js
+ helper JScript file used by extract_downloads to extract all
+ of the files in a Zip into a specified desktop folder
+
+ wget-win.js
+ helper JScript file used by fetch_downloads to make web requests
+ for downloading of specified URLs to specific download locations.
+
+
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+ 1.0.0 2015-01-08-21:14 Create initial version to account for the files in
+ the external\ folder
+
+ *** end of external.txt ***
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/2d963742/external/extract_downloads.bat
----------------------------------------------------------------------
diff --git a/external/extract_downloads.bat b/external/extract_downloads.bat
index a431567..ffeedf2 100644
--- a/external/extract_downloads.bat
+++ b/external/extract_downloads.bat
@@ -1,5 +1,5 @@
@echo off
-rem extract_downloads.bat 1.01 UTF-8
+rem extract_downloads.bat 1.1.0 UTF-8
rem EXTRACT THE EXTERNAL DOWNLOADS TO INCLUDE, LIB, AND BIN FOLDERS
rem Fetch downloads in case not done yet
@@ -44,10 +44,12 @@ rem path segments each ending with "\".
:SDL2x86
rem taking T\%2include and T\%2lib\*.lib across, with T\%2lib\*.dll to bin
+rem move any license *.txt files to the bin also.
CALL :UNZIP %1
XCOPY "%~dp0download\T\%2include\*.*" "%~dp0download\include" /I /Q /Y >nul
XCOPY "%~dp0download\T\%2lib\x86\*.lib" "%~dp0download\lib" /I /Q /Y >nul
XCOPY "%~dp0download\T\%2lib\x86\*.dll" "%~dp0download\bin" /I /Q /Y >nul
+XCOPY "%~dp0download\T\%2lib\x86\*.txt" "%~dp0download\bin" /I /Q /Y >nul 2>&1
EXIT /B 0
:ICONV
@@ -112,10 +114,12 @@ ECHO: *** No extractions have been performed.
ECHO:
EXIT /B 2
-rem 1.01 2015-01-02-17:03 Silence warnings when removing non-existent
-rem directories
-rem 1.00 2015-01-02-16:25 Complete Full-Functioning Externals Extraction
-rem Delivering the download\include, donwload\lib, and download\bin
-rem collections established for the current external downloads.
+rem 1.1.0 2015-01-08-14:41 Extract SDL2 Licenses
+rem The license files are added to the bin\ extraction.
+rem 1.01 2015-01-02-17:03 Silence warnings when removing non-existent
+rem directories
+rem 1.00 2015-01-02-16:25 Complete Full-Functioning Externals Extraction
+rem Delivering the download\include, donwload\lib, and download\bin
+rem collections established for the current external downloads.
rem *** end of extract_downloads.bat ***
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/2d963742/external/fetch_downloads.bat
----------------------------------------------------------------------
diff --git a/external/fetch_downloads.bat b/external/fetch_downloads.bat
index 0d5309b..08a815b 100644
--- a/external/fetch_downloads.bat
+++ b/external/fetch_downloads.bat
@@ -1,5 +1,5 @@
@echo off
-rem fetch_downloads.bat 1.00 UTF-8
+rem fetch_downloads.bat 1.1.0 UTF-8
rem FETCH EXTERNAL ARCHIVES FOR NATIVE WINDOWS BUILDS OF CORINTHIA
MKDIR "%~dp0download" >nul 2>&1
@@ -18,22 +18,23 @@ EXIT /B 0
IF EXIST "%~dp0download\%~n1%~x1" EXIT /B 0
rem do not download an archive that is already present.
Cscript /nologo "%~dp0wget-win.js" //B "%1" "%~dp0download\%~n1%~x1"
+rem This procedure always succeeds. It needs some error handling.
IF EXIST "%~dp0download\%~n1%~x1" ECHO: %~n1%~x1% downloaded
EXIT /B 0
+
rem TODO
-rem * Might want to pass up and act on error codes from the individual
-rem :FETCH operations.
rem * It might be handy to fetch these URLs from a file so that it can
rem be kept maintained in one place, even though the win32 cases are
rem unique to building for Windows.
-rem * Silent the warning on download folder already existing
rem XXX
rem * wget-win.js does not do FTP. So alternative locations have been
rem used for iconv and libmxl2.
-rem 1.00 2015-01-02-16:51 Complete with mating to extract_downloads.bat
-rem The tested version is adjusted to list successful downloads
-rem and not any that are not needed or fail.
+rem 1.1.0 2015-01-08-18:42 Adjust to line up with maintenance description
+rem The TODO list is updated. The always successful :FETCH noted.
+rem 1.00 2015-01-02-16:51 Complete with mating to extract_downloads.bat
+rem The tested version is adjusted to list successful downloads
+rem and not any that are not needed or fail.
rem *** end of fetch_downloads.bat ***
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/2d963742/external/maintenance.txt
----------------------------------------------------------------------
diff --git a/external/maintenance.txt b/external/maintenance.txt
new file mode 100644
index 0000000..17c6c21
--- /dev/null
+++ b/external/maintenance.txt
@@ -0,0 +1,166 @@
+maintenance.txt 1.0.0 UTF-8 2015-01-08
+
+ MAINTAIN THE EXTERNAL DOWNLOADS PROCEDURES
+ ==========================================
+
+ The external\ folder holds scripts that provide for specific downloads
+ to be obtained over the internet and retained in a download\ sub-folder.
+ The scripts also provide for the extraction of code and libraries from
+ the downloaded archives and making them available for use in builds on
+ Windows and in deployed packages on Windows.
+
+ When the source or version of downloads change, and other downloads are
+ added, these procedures must be maintained. Almost all of the maintenance
+ and related customization is in the two procedure fetch_downloads.bat
+ and extract_downloads.bat.
+
+ There are interdependencies among the two scripts and within the second
+ script that must be maintained and carefully verified.
+
+ This file provides guidance on how to preserve correct, tested operation
+ as maintenance and customization are performed.
+
+MAINTAINING FETCH_DOWNLOADS.BAT
+-------------------------------
+
+CREATING THE DOWNLOAD\ SUB-FOLDER
+
+This file creates the download\ subdirectory in the same folder as the script
+when it is not present already. It does not remove anything from a folder
+that is already there.
+
+The single command
+
+ MKDIR "%~dp0download" >nul 2>&1
+
+accomplishes that. The script parameter %~dp0 uses the drive and path of
+the location of the script itself (ending in "\") and appends the download
+name for the desired subdirectory. (This scheme is used throughout the
+scripts.) Any console output is routed to nul, and any error message output
+is routed to the same place as the console. This eliminates nuisance warnings
+about directories already existing, etc.
+
+DOWNLOADING THE EXTERNAL CONTENT
+
+Each download is accomplished with one of the lines that performs a
+CALL :FETCH operation. The one parameter on the same line is the full URL
+of a file to download.
+
+There are two important variables to observe. The full URL must be the
+complete location for accessing the file on the Internet using HTTP. The
+downloads must use HTTP in this implementation.
+
+Furthermore, the name by which the download will be stored will be the
+file name at the end of the URL. The :FETCH procedure takes apart the
+URL and specifies the correct file name to use when storing in the download\
+folder.
+
+The fetch_downloads.bat procedure is mostly silent. If it is discovered
+that a file to be downloaded is already present, it is left intact and not
+downloaded again. If there is a download operation, and the file is present
+afterwards, the name of the file is announced on the console. And if that
+download fails, there is also silence.
+
+TESTING AND TROUBLE-SHOOTING
+
+If there is any doubt about a download, the easiest way to determine if it
+is working is by putting the URL in the address bar of a browser and seeing
+whether the file is delivered.
+
+It is possible to run fetch_downloads.bat multiple times. Once all of the
+files are all present (if downloadable), there will be no further output.
+Look in the download\ directory to see what files are present.
+
+It may be necessary to trouble-shoot collisions of names that are the same
+when case is ignored, and there can be other problems with special characters
+that are not permitted in Windows file names (or that are reserved names, like
+"nul").
+
+Finally, the wget-win.js never fails, and it will always store *something*
+at the destination location. This can lead to file-not-found messages in the extract_downloads.bat script.
+
+
+MAINTAINING EXTRACT_DOWNLOADS.BAT
+---------------------------------
+
+The extract_downloads.bat script first does a CALL fetch_downloads.bat. This
+does no harm and it automatically obtains the downloads if they are not there
+already.
+
+CHECKING THAT THE DOWNLOADS ARE PRESENT
+
+The first part of extract_downloads.bat is a series of CALL :CHECK commands.
+Each one of these names one of the downloads that should now be present.
+If they are not all there, the procedure will report that and stop.
+
+The important feature of the CALL :CHECK commands is they must list exactly
+the same files that are specified in the CALL :FETCH commands in
+fetch_downloads.bat. These are the names the files should have been stored
+with.
+
+It is possible that a file is present but it is incorrect. This will usually
+show up with unusual results from the extract operations.
+
+PERFORMING EXTRACTIONS
+
+The actual extraction procedure is very specific to the individual downloads.
+There is some abstraction into general, reusable procedures, but they are
+still very specific to the nature of the download.
+
+There is a consistent extraction API for these custom routines. The first
+parameter is the name of the downloaded file. This should agree with the
+name in the CALL :CHECK operation.
+
+The second parameter indicates where inside of a Zip, the interesting data
+starts. Many of the Zip files unload a single directory as their top level
+and then the actual payload is at the level below that directory. When that
+is the case, the path prior to the payload is specified with a non-empty
+second parameter.
+
+This can be seen by examining some of the calls and comparing with how the
+Zip files are organized by inspecting them in the Windows file system.
+
+What's important:
+ 1. When an existing download is upgraded to use a new version, the file name
+ will change and so many any second parameter, since it often is a folder
+ whose name is based on the version of the related library.
+ 2. When an existing download is upgraded, the structure of the main material
+ may change, so a different set of XCOPY operations may be required to
+ extract the material correctly.
+
+This is even more involved when a new custom download is introduced.
+
+TESTING AND TROUBLESHOOTING
+
+The easiest way to test individual extractions is to remark-out all of the
+CALL procedures but the one to be tested. The extraction from the one
+archive can be seen in the download\T\ folder, and one can verify the
+download\include\, download\lib\, and download\bin results manually.
+
+
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+ 1.0.0 2015-01-08-19:12 Create initial version to account for the way
+ the scripts operate and will need to be modified on upgrades of
+ any of the downloads.
+
+ *** end of maintenance.txt ***
\ No newline at end of file
[30/33] incubator-corinthia git commit: Update copyright notice
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/html/DFHTMLTables.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFHTMLTables.h b/DocFormats/core/src/html/DFHTMLTables.h
index 9291de7..18bfda3 100644
--- a/DocFormats/core/src/html/DFHTMLTables.h
+++ b/DocFormats/core/src/html/DFHTMLTables.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFHTMLTables_h
#define DocFormats_DFHTMLTables_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/html/DFTidyHelper.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFTidyHelper.c b/DocFormats/core/src/html/DFTidyHelper.c
index f2f2303..ae4294d 100644
--- a/DocFormats/core/src/html/DFTidyHelper.c
+++ b/DocFormats/core/src/html/DFTidyHelper.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "DFTidyHelper.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/html/DFTidyHelper.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFTidyHelper.h b/DocFormats/core/src/html/DFTidyHelper.h
index 6ed6c81..df5075c 100644
--- a/DocFormats/core/src/html/DFTidyHelper.h
+++ b/DocFormats/core/src/html/DFTidyHelper.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFTidyHelper_h
#define DocFormats_DFTidyHelper_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/html/DFTidyWrapper.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFTidyWrapper.c b/DocFormats/core/src/html/DFTidyWrapper.c
index 72fe583..7b81ed6 100644
--- a/DocFormats/core/src/html/DFTidyWrapper.c
+++ b/DocFormats/core/src/html/DFTidyWrapper.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "DFTidyWrapper.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/html/DFTidyWrapper.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFTidyWrapper.h b/DocFormats/core/src/html/DFTidyWrapper.h
index 12ac589..4cb6cfb 100644
--- a/DocFormats/core/src/html/DFTidyWrapper.h
+++ b/DocFormats/core/src/html/DFTidyWrapper.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFTidyWrapper_h
#define DocFormats_DFTidyWrapper_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/DFAllocator.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFAllocator.c b/DocFormats/core/src/lib/DFAllocator.c
index 722fe0a..f6de4ae 100644
--- a/DocFormats/core/src/lib/DFAllocator.c
+++ b/DocFormats/core/src/lib/DFAllocator.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFAllocator.h"
#include "DFCommon.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/DFAllocator.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFAllocator.h b/DocFormats/core/src/lib/DFAllocator.h
index 94f40eb..d95cf5d 100644
--- a/DocFormats/core/src/lib/DFAllocator.h
+++ b/DocFormats/core/src/lib/DFAllocator.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFAllocator_h
#define DocFormats_DFAllocator_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/DFArray.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFArray.c b/DocFormats/core/src/lib/DFArray.c
index 28e1317..98b70b2 100644
--- a/DocFormats/core/src/lib/DFArray.c
+++ b/DocFormats/core/src/lib/DFArray.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFArray.h"
#include "DFCommon.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/DFArray.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFArray.h b/DocFormats/core/src/lib/DFArray.h
index 18f09f9..7996c5e 100644
--- a/DocFormats/core/src/lib/DFArray.h
+++ b/DocFormats/core/src/lib/DFArray.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFArray_h
#define DocFormats_DFArray_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/DFBuffer.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFBuffer.c b/DocFormats/core/src/lib/DFBuffer.c
index 92c7a02..5527c9b 100644
--- a/DocFormats/core/src/lib/DFBuffer.c
+++ b/DocFormats/core/src/lib/DFBuffer.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "DFBuffer.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/DFBuffer.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFBuffer.h b/DocFormats/core/src/lib/DFBuffer.h
index 5103003..08aa204 100644
--- a/DocFormats/core/src/lib/DFBuffer.h
+++ b/DocFormats/core/src/lib/DFBuffer.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFBuffer_h
#define DocFormats_DFBuffer_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/DFCallback.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFCallback.c b/DocFormats/core/src/lib/DFCallback.c
index 5d5ab4f..4713857 100644
--- a/DocFormats/core/src/lib/DFCallback.c
+++ b/DocFormats/core/src/lib/DFCallback.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFCallback.h"
#include "DFCommon.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/DFCallback.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFCallback.h b/DocFormats/core/src/lib/DFCallback.h
index 58db7fe..bf72a31 100644
--- a/DocFormats/core/src/lib/DFCallback.h
+++ b/DocFormats/core/src/lib/DFCallback.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFCallback_h
#define DocFormats_DFCallback_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/DFCharacterSet.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFCharacterSet.c b/DocFormats/core/src/lib/DFCharacterSet.c
index b9e72dc..bf19476 100644
--- a/DocFormats/core/src/lib/DFCharacterSet.c
+++ b/DocFormats/core/src/lib/DFCharacterSet.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFCharacterSet.h"
#include "DFCommon.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/DFCharacterSet.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFCharacterSet.h b/DocFormats/core/src/lib/DFCharacterSet.h
index 534b850..a0e92f5 100644
--- a/DocFormats/core/src/lib/DFCharacterSet.h
+++ b/DocFormats/core/src/lib/DFCharacterSet.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFCharacterSet_h
#define DocFormats_DFCharacterSet_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/DFError.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFError.c b/DocFormats/core/src/lib/DFError.c
index 4eb19dd..a03d35f 100644
--- a/DocFormats/core/src/lib/DFError.c
+++ b/DocFormats/core/src/lib/DFError.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include <DocFormats/DFError.h>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/DFFilesystem.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFFilesystem.c b/DocFormats/core/src/lib/DFFilesystem.c
index 66c8a79..6a2b493 100644
--- a/DocFormats/core/src/lib/DFFilesystem.c
+++ b/DocFormats/core/src/lib/DFFilesystem.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "DFFilesystem.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/DFFilesystem.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFFilesystem.h b/DocFormats/core/src/lib/DFFilesystem.h
index e3e2869..3754dd7 100644
--- a/DocFormats/core/src/lib/DFFilesystem.h
+++ b/DocFormats/core/src/lib/DFFilesystem.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFUtil_h
#define DocFormats_DFUtil_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/DFHashTable.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFHashTable.c b/DocFormats/core/src/lib/DFHashTable.c
index 6a1cfe8..0559f6d 100644
--- a/DocFormats/core/src/lib/DFHashTable.c
+++ b/DocFormats/core/src/lib/DFHashTable.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "DFHashTable.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/DFHashTable.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFHashTable.h b/DocFormats/core/src/lib/DFHashTable.h
index 7eaad43..89c8403 100644
--- a/DocFormats/core/src/lib/DFHashTable.h
+++ b/DocFormats/core/src/lib/DFHashTable.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFHashTable_h
#define DocFormats_DFHashTable_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/DFStorage.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFStorage.c b/DocFormats/core/src/lib/DFStorage.c
index 04521aa..3087514 100644
--- a/DocFormats/core/src/lib/DFStorage.c
+++ b/DocFormats/core/src/lib/DFStorage.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include <DocFormats/DFStorage.h>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/DFString.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFString.c b/DocFormats/core/src/lib/DFString.c
index b768ef4..ca9ac86 100644
--- a/DocFormats/core/src/lib/DFString.c
+++ b/DocFormats/core/src/lib/DFString.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "DFString.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/DFString.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFString.h b/DocFormats/core/src/lib/DFString.h
index 5530c61..75856c2 100644
--- a/DocFormats/core/src/lib/DFString.h
+++ b/DocFormats/core/src/lib/DFString.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFString_h
#define DocFormats_DFString_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/DFZipFile.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFZipFile.c b/DocFormats/core/src/lib/DFZipFile.c
index faec05f..ee5a648 100644
--- a/DocFormats/core/src/lib/DFZipFile.c
+++ b/DocFormats/core/src/lib/DFZipFile.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "DFZipFile.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/DFZipFile.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFZipFile.h b/DocFormats/core/src/lib/DFZipFile.h
index 332cace..10fe461 100644
--- a/DocFormats/core/src/lib/DFZipFile.h
+++ b/DocFormats/core/src/lib/DFZipFile.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFZipFile_h
#define DocFormats_DFZipFile_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/TextPackage.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/TextPackage.c b/DocFormats/core/src/lib/TextPackage.c
index b81a42e..6e6e0fa 100644
--- a/DocFormats/core/src/lib/TextPackage.c
+++ b/DocFormats/core/src/lib/TextPackage.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "TextPackage.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/lib/TextPackage.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/TextPackage.h b/DocFormats/core/src/lib/TextPackage.h
index 077f84e..2edb3d6 100644
--- a/DocFormats/core/src/lib/TextPackage.h
+++ b/DocFormats/core/src/lib/TextPackage.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef dfutil_TextPackage_h
#define dfutil_TextPackage_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/xml/DFChanges.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/xml/DFChanges.c b/DocFormats/core/src/xml/DFChanges.c
index 8dd44de..5e5e292 100644
--- a/DocFormats/core/src/xml/DFChanges.c
+++ b/DocFormats/core/src/xml/DFChanges.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "DFChanges.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/xml/DFChanges.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/xml/DFChanges.h b/DocFormats/core/src/xml/DFChanges.h
index 16759e4..939c352 100644
--- a/DocFormats/core/src/xml/DFChanges.h
+++ b/DocFormats/core/src/xml/DFChanges.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef dfutil_DFChanges_h
#define dfutil_DFChanges_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/xml/DFDOM.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/xml/DFDOM.c b/DocFormats/core/src/xml/DFDOM.c
index 413880e..464cfb6 100644
--- a/DocFormats/core/src/xml/DFDOM.c
+++ b/DocFormats/core/src/xml/DFDOM.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "DFDOM.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/xml/DFDOM.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/xml/DFDOM.h b/DocFormats/core/src/xml/DFDOM.h
index 1ea863e..44e81fe 100644
--- a/DocFormats/core/src/xml/DFDOM.h
+++ b/DocFormats/core/src/xml/DFDOM.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFDOM_h
#define DocFormats_DFDOM_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/xml/DFMarkupCompatibility.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/xml/DFMarkupCompatibility.c b/DocFormats/core/src/xml/DFMarkupCompatibility.c
index 33dc69d..5fb087c 100644
--- a/DocFormats/core/src/xml/DFMarkupCompatibility.c
+++ b/DocFormats/core/src/xml/DFMarkupCompatibility.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "DFMarkupCompatibility.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/xml/DFMarkupCompatibility.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/xml/DFMarkupCompatibility.h b/DocFormats/core/src/xml/DFMarkupCompatibility.h
index d421d54..c8a5273 100644
--- a/DocFormats/core/src/xml/DFMarkupCompatibility.h
+++ b/DocFormats/core/src/xml/DFMarkupCompatibility.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFMarkupCompatibility_h
#define DocFormats_DFMarkupCompatibility_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/xml/DFNameMap.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/xml/DFNameMap.c b/DocFormats/core/src/xml/DFNameMap.c
index f408003..93430a6 100644
--- a/DocFormats/core/src/xml/DFNameMap.c
+++ b/DocFormats/core/src/xml/DFNameMap.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "DFNameMap.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/xml/DFNameMap.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/xml/DFNameMap.h b/DocFormats/core/src/xml/DFNameMap.h
index 9be2c39..1a8c76b 100644
--- a/DocFormats/core/src/xml/DFNameMap.h
+++ b/DocFormats/core/src/xml/DFNameMap.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFNameMap_h
#define DocFormats_DFNameMap_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/xml/DFXML.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/xml/DFXML.c b/DocFormats/core/src/xml/DFXML.c
index 2172651..0f9dfd5 100644
--- a/DocFormats/core/src/xml/DFXML.c
+++ b/DocFormats/core/src/xml/DFXML.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "DFXML.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/xml/DFXML.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/xml/DFXML.h b/DocFormats/core/src/xml/DFXML.h
index 3318706..a36c638 100644
--- a/DocFormats/core/src/xml/DFXML.h
+++ b/DocFormats/core/src/xml/DFXML.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFXML_h
#define DocFormats_DFXML_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/tests/common/BDTTests.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/tests/common/BDTTests.c b/DocFormats/core/tests/common/BDTTests.c
index df10d02..45879d2 100644
--- a/DocFormats/core/tests/common/BDTTests.c
+++ b/DocFormats/core/tests/common/BDTTests.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "BDTTests.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/tests/common/BDTTests.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/tests/common/BDTTests.h b/DocFormats/core/tests/common/BDTTests.h
index f4bae09..7e1b63a 100644
--- a/DocFormats/core/tests/common/BDTTests.h
+++ b/DocFormats/core/tests/common/BDTTests.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef dfutil_BDTTest_h
#define dfutil_BDTTest_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/tests/css/CSSTests.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/tests/css/CSSTests.c b/DocFormats/core/tests/css/CSSTests.c
index 4612588..ae18dce 100644
--- a/DocFormats/core/tests/css/CSSTests.c
+++ b/DocFormats/core/tests/css/CSSTests.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "DFUnitTest.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/tests/html/HTMLPlain.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/tests/html/HTMLPlain.c b/DocFormats/core/tests/html/HTMLPlain.c
index d260de4..75075bd 100644
--- a/DocFormats/core/tests/html/HTMLPlain.c
+++ b/DocFormats/core/tests/html/HTMLPlain.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "HTMLPlain.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/tests/html/HTMLPlain.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/tests/html/HTMLPlain.h b/DocFormats/core/tests/html/HTMLPlain.h
index 210282e..8d32917 100644
--- a/DocFormats/core/tests/html/HTMLPlain.h
+++ b/DocFormats/core/tests/html/HTMLPlain.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_HTMLPlain_h
#define DocFormats_HTMLPlain_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/tests/html/HTMLTests.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/tests/html/HTMLTests.c b/DocFormats/core/tests/html/HTMLTests.c
index 76a1424..620182d 100644
--- a/DocFormats/core/tests/html/HTMLTests.c
+++ b/DocFormats/core/tests/html/HTMLTests.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "DFUnitTest.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/tests/lib/LibTests.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/tests/lib/LibTests.c b/DocFormats/core/tests/lib/LibTests.c
index cbf3bc7..b4382c9 100644
--- a/DocFormats/core/tests/lib/LibTests.c
+++ b/DocFormats/core/tests/lib/LibTests.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFUnitTest.h"
#include <stddef.h>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/tests/xml/XMLTests.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/tests/xml/XMLTests.c b/DocFormats/core/tests/xml/XMLTests.c
index a7ca32b..da4480d 100644
--- a/DocFormats/core/tests/xml/XMLTests.c
+++ b/DocFormats/core/tests/xml/XMLTests.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFUnitTest.h"
#include <stddef.h>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/latex/src/HTMLToLaTeX.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/latex/src/HTMLToLaTeX.c b/DocFormats/filters/latex/src/HTMLToLaTeX.c
index 10be122..d555731 100644
--- a/DocFormats/filters/latex/src/HTMLToLaTeX.c
+++ b/DocFormats/filters/latex/src/HTMLToLaTeX.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "HTMLToLaTeX.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/latex/src/HTMLToLaTeX.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/latex/src/HTMLToLaTeX.h b/DocFormats/filters/latex/src/HTMLToLaTeX.h
index 6c71282..e0faa2e 100644
--- a/DocFormats/filters/latex/src/HTMLToLaTeX.h
+++ b/DocFormats/filters/latex/src/HTMLToLaTeX.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_HTMLToLaTeX_h
#define DocFormats_HTMLToLaTeX_h
[04/33] incubator-corinthia git commit: .gitattributes 1.1.0
Posted by ja...@apache.org.
.gitattributes 1.1.0
An inventory of known test documents is reviewed and the various
binary-format extensions added to the .gitattributes, now versioned and
dated so that there are clues about what is current.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/944312a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/944312a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/944312a8
Branch: refs/heads/experiment64
Commit: 944312a8cfa04c5ae55f28fee529097eda4619f4
Parents: 2d37450
Author: Dennis Hamilton <or...@apache.org>
Authored: Thu Jan 8 10:33:16 2015 -0800
Committer: Dennis Hamilton <or...@apache.org>
Committed: Thu Jan 8 10:33:16 2015 -0800
----------------------------------------------------------------------
.gitattributes | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 60 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/944312a8/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
index a77dbf0..f981553 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,4 @@
-# .gitattributes UTF-8
+# .gitattributes 1.1.0 UTF-8 2015-01-08
#
# GIT ATTRIBUTES FOR THE CORINTHIA GIT REPOSITORY
@@ -13,13 +13,72 @@
# Denote all files that are truly binary and must not be scanned for line-end.
# Some of these might also be .gitignored. Better safe than sorry.
+# NOT AN EXHAUSTIVE LIST. Before adding a binary format to the repository,
+# verify that it is listed here.
+# Common binary formats
+*.bin binary
*.bmp binary
+*.dat binary
+*.jpeg binary
*.jpg binary
+*.pdf binary
*.png binary
*.suo binary
+*.wav binary
*.zip binary
+# ODF/OpenOffice binary document formats
+*.odt binary
+*.ott binary
+*.odg binary
+*.otg binary
+*.odp binary
+*.otp binary
+*.ods binary
+*.ots binary
+*.odc binary
+*.otc binary
+*.odi binary
+*.oti binary
+*.odf binary
+*.otf binary
+*.odm binary
+*.oxt binary
+
+# OOXML/Microsoft Office binary document formats (common ones)
+*.doc binary
+*.docm binary
+*.docx binary
+*.dot binary
+*.dotx binary
+*.emf binary
+*.pub binary
+*.ppt binary
+*.pptm binary
+*.pptx binary
+*.vsd binary
+*.xls binary
+*.xlsm binary
+*.xlsx binary
+
+# Other folks binary document formats
+*.adm binary
+*.dib binary
+*.mdb binary
+*.mpp binary
+*.msg binary
+*.ole2 binary
+*.ooxml binary
+*.pfx binary
+*.qwp binary
+*.shw binary
+*.sldprt binary
+*.wps binary
+*.zvi binary
+
+
+
# *** end of .gitattributes ***
[11/33] incubator-corinthia git commit: Fix build on windows (VC++
parser error)
Posted by ja...@apache.org.
Fix build on windows (VC++ parser error)
Forgot to add a ;; required to get around a bug in the Visual C++ parser
in the case where a single-line if body immediately precedes a line
containing a variable declaration with a typedef'd type.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/22947efb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/22947efb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/22947efb
Branch: refs/heads/experiment64
Commit: 22947efbb19452866cf838ca114341253be03011
Parents: cd6ccd0
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Sun Jan 11 01:18:51 2015 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Sun Jan 11 01:18:51 2015 +0700
----------------------------------------------------------------------
DocFormats/filters/ooxml/tests/word/WordPlain.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/22947efb/DocFormats/filters/ooxml/tests/word/WordPlain.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/tests/word/WordPlain.c b/DocFormats/filters/ooxml/tests/word/WordPlain.c
index b1f4d4b..9857817 100644
--- a/DocFormats/filters/ooxml/tests/word/WordPlain.c
+++ b/DocFormats/filters/ooxml/tests/word/WordPlain.c
@@ -110,7 +110,7 @@ static char *computeDocumentRelsPath(const char *documentPath)
static void parseDocumentRels(const char *documentPath, DFDocument *relsDoc, DFHashTable *rels, DFError **error)
{
if (relsDoc == NULL)
- return;
+ return;;
const char *basePrefix = (documentPath[0] == '/') ? "" : "/";
char *basePath = DFFormatString("%s%s",basePrefix,documentPath);
for (DFNode *child = relsDoc->root->first; child != NULL; child = child->next) {
[24/33] incubator-corinthia git commit: README.txt 1.1.1
Posted by ja...@apache.org.
README.txt 1.1.1
A stray word is removed from the list of DLLs in Section 4 of the README
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/9e8e44c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/9e8e44c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/9e8e44c3
Branch: refs/heads/experiment64
Commit: 9e8e44c36be35e7367269fe12c848de26e352595
Parents: 8f24246
Author: Dennis Hamilton <or...@apache.org>
Authored: Mon Jan 12 19:25:20 2015 -0800
Committer: Dennis Hamilton <or...@apache.org>
Committed: Mon Jan 12 19:25:20 2015 -0800
----------------------------------------------------------------------
external/README.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9e8e44c3/external/README.txt
----------------------------------------------------------------------
diff --git a/external/README.txt b/external/README.txt
index efbbfb4..7c5ad65 100644
--- a/external/README.txt
+++ b/external/README.txt
@@ -1,4 +1,4 @@
-README.txt 1.1.0 UTF-8
+README.txt 1.1.1 UTF-8
EXTERNAL DOWNLOADS SETUP AND USE
================================
@@ -131,7 +131,6 @@ The compiled executables will need to be installed in folders that also have
copies of DLLs from external\download\bin\
iconv.dll
- exit
libjpeg-9.dll
libpng16-16.dll
libtiff-5.dll
@@ -177,6 +176,7 @@ consult information on the individual component.
REVISIONS
+ 1.1.1 2015-01-12-19:24 Stray word removed from the list of DLLs in Section 4
1.1.0 2015-01-08-21:20 Updated Draft with complete coverage
1.0.0 2015-01-08-15:21 Initial Draft replacement of the original README.txt
[21/33] incubator-corinthia git commit: Word: Remove idPrefix
parameter
Posted by ja...@apache.org.
Word: Remove idPrefix parameter
It used to be that code using the DocFormats library would supply a
prefix to be used on all id attributes in the HTML file which were used
to maintain a mapping back to the elements in the original document.
The reason for this was that in UX Write, if you copied & pasted from
one word document to another, the HTML code would be pasted as-is, and
this could result in incorrect mappings being stored in the destination
file.
UX Write handles this differently now (can't remember the details; it
was a long time ago I made the change), and for a long time we've been
using the fixed prefix of "word" for all id attributes. So we don't need
that as a parameter to the conversion functions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/22300247
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/22300247
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/22300247
Branch: refs/heads/experiment64
Commit: 2230024704d9acda7b4a705e6b9da9e0c6304803
Parents: 1706df1
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Sun Jan 11 13:23:07 2015 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Sun Jan 11 13:23:07 2015 +0700
----------------------------------------------------------------------
DocFormats/filters/ooxml/src/word/Word.c | 18 +++++++-----------
DocFormats/filters/ooxml/src/word/WordConverter.c | 17 ++++++-----------
DocFormats/filters/ooxml/src/word/WordConverter.h | 8 ++------
3 files changed, 15 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/22300247/DocFormats/filters/ooxml/src/word/Word.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/Word.c b/DocFormats/filters/ooxml/src/word/Word.c
index 1e06448..4f8dd31 100644
--- a/DocFormats/filters/ooxml/src/word/Word.c
+++ b/DocFormats/filters/ooxml/src/word/Word.c
@@ -34,7 +34,7 @@ DFDocument *WordGet(DFStorage *concreteStorage, DFStorage *abstractStorage, DFEr
goto end;
htmlDoc = DFDocumentNew();
- if (!WordConverterGet(htmlDoc,abstractStorage,"word",wordPackage,error))
+ if (!WordConverterGet(htmlDoc,abstractStorage,wordPackage,error))
goto end;
ok = 1;
@@ -55,13 +55,11 @@ int WordPut(DFStorage *concreteStorage, DFStorage *abstractStorage, DFDocument *
int ok = 0;
WordPackage *wordPackage = NULL;
- const char *idPrefix = "word";
-
wordPackage = WordPackageOpenFrom(concreteStorage,error);
if (wordPackage == NULL)
goto end;
- if (!WordConverterPut(htmlDoc,abstractStorage,idPrefix,wordPackage,error))
+ if (!WordConverterPut(htmlDoc,abstractStorage,wordPackage,error))
goto end;
if (!WordPackageSave(wordPackage,error))
@@ -79,19 +77,17 @@ int WordCreate(DFStorage *concreteStorage, DFStorage *abstractStorage, DFDocumen
int ok = 0;
WordPackage *wordPackage = NULL;
- const char *idPrefix = "word";
-
wordPackage = WordPackageOpenNew(concreteStorage,error);
if (wordPackage == NULL)
goto end;
- // Change any id attributes starting with "word" or "odf" to a different prefix, so they
+ // Change any id attributes starting with "word" to a different prefix, so they
// are not treated as references to nodes in the destination document. This is necessary
- // if the HTML file was previously generated from a word or odf file, and we are creating
- // a new word or odf file from it.
- HTMLBreakBDTRefs(htmlDoc->docNode,idPrefix);
+ // if the HTML file was previously generated from a word file, and we are creating
+ // a new word file from it.
+ HTMLBreakBDTRefs(htmlDoc->docNode,"word");
- if (!WordConverterPut(htmlDoc,abstractStorage,idPrefix,wordPackage,error))
+ if (!WordConverterPut(htmlDoc,abstractStorage,wordPackage,error))
goto end;
if (!WordPackageSave(wordPackage,error))
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/22300247/DocFormats/filters/ooxml/src/word/WordConverter.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordConverter.c b/DocFormats/filters/ooxml/src/word/WordConverter.c
index 7e8f2ca..0e823bb 100644
--- a/DocFormats/filters/ooxml/src/word/WordConverter.c
+++ b/DocFormats/filters/ooxml/src/word/WordConverter.c
@@ -557,14 +557,13 @@ static void Word_postProcessHTMLDoc(WordConverter *conv)
// //
////////////////////////////////////////////////////////////////////////////////////////////////////
-static WordConverter *WordConverterNew(DFDocument *html, DFStorage *abstractStorage,
- const char *idPrefix, WordPackage *package)
+static WordConverter *WordConverterNew(DFDocument *html, DFStorage *abstractStorage, WordPackage *package)
{
WordConverter *converter = (WordConverter *)calloc(1,sizeof(WordConverter));
converter->html = DFDocumentRetain(html);
converter->abstractStorage = DFStorageRetain(abstractStorage);
assert(DFStorageFormat(converter->abstractStorage) == DFFileFormatHTML);
- converter->idPrefix = DFStrDup(idPrefix);
+ converter->idPrefix = strdup("word");
converter->package = WordPackageRetain(package);
converter->styles = WordSheetNew(converter->package->styles);
converter->numbering = WordNumberingNew(converter->package);
@@ -674,9 +673,7 @@ DFNode *WordConverterGetConcrete(WordPutData *put, DFNode *abstract)
return node;
}
-int WordConverterGet(DFDocument *html, DFStorage *abstractStorage,
- const char *idPrefix, WordPackage *package,
- DFError **error)
+int WordConverterGet(DFDocument *html, DFStorage *abstractStorage, WordPackage *package, DFError **error)
{
if (package->document == NULL) {
DFErrorFormat(error,"document.xml not found");
@@ -692,7 +689,7 @@ int WordConverterGet(DFDocument *html, DFStorage *abstractStorage,
int haveFields = Word_simplifyFields(package);
Word_mergeRuns(package);
- WordConverter *converter = WordConverterNew(html,abstractStorage,idPrefix,package);
+ WordConverter *converter = WordConverterNew(html,abstractStorage,package);
converter->haveFields = haveFields;
WordAddNbsps(converter->package->document);
WordFixLists(converter);
@@ -810,9 +807,7 @@ static void addMissingDefaultStyles(WordConverter *converter)
}
}
-int WordConverterPut(DFDocument *html, DFStorage *abstractStorage,
- const char *idPrefix, WordPackage *package,
- DFError **error)
+int WordConverterPut(DFDocument *html, DFStorage *abstractStorage, WordPackage *package, DFError **error)
{
if (package->document == NULL) {
DFErrorFormat(error,"document.xml not found");
@@ -828,7 +823,7 @@ int WordConverterPut(DFDocument *html, DFStorage *abstractStorage,
HTML_normalizeDocument(html);
HTML_pushDownInlineProperties(html->docNode);
- WordConverter *converter = WordConverterNew(html,abstractStorage,idPrefix,package);
+ WordConverter *converter = WordConverterNew(html,abstractStorage,package);
// FIXME: Need a more reliable way of telling whether this is a new document or not - it could be that the
// document already existed (with styles set up) but did not have any content
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/22300247/DocFormats/filters/ooxml/src/word/WordConverter.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordConverter.h b/DocFormats/filters/ooxml/src/word/WordConverter.h
index c0565f2..5451540 100644
--- a/DocFormats/filters/ooxml/src/word/WordConverter.h
+++ b/DocFormats/filters/ooxml/src/word/WordConverter.h
@@ -98,12 +98,8 @@ struct WordConverter {
CSSSheet *styleSheet;
};
-int WordConverterGet(DFDocument *html, DFStorage *abstractStorage,
- const char *idPrefix, WordPackage *package,
- DFError **error);
-int WordConverterPut(DFDocument *html, DFStorage *abstractStorage,
- const char *idPrefix, WordPackage *package,
- DFError **error);
+int WordConverterGet(DFDocument *html, DFStorage *abstractStorage, WordPackage *package, DFError **error);
+int WordConverterPut(DFDocument *html, DFStorage *abstractStorage, WordPackage *package, DFError **error);
void WordConverterWarning(WordConverter *converter, const char *format, ...) ATTRIBUTE_FORMAT(printf,2,3);
char *WordStyleIdForStyle(CSSStyle *style);
[10/33] incubator-corinthia git commit: dfutil: Fix pretty-printing
option (-pp)
Posted by ja...@apache.org.
dfutil: Fix pretty-printing option (-pp)
Word_toPlainFromDir was incorrectly interpreting relative path names in
OPC relationship files for word documents. Instead of calculating the
path relative to the root of the package, it would use the path relative
to the location of the document.xml file.
This was causing the pretty-printing routine to encounter an error when
looking for files like styles.xml, because it would check for them in
the root of the package, rather than the directory in which they were
located (usually /word).
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/cd6ccd0e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/cd6ccd0e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/cd6ccd0e
Branch: refs/heads/experiment64
Commit: cd6ccd0e7625384733db58d92dca7a87249d1247
Parents: cc208a6
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Sun Jan 11 01:10:58 2015 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Sun Jan 11 01:10:58 2015 +0700
----------------------------------------------------------------------
DocFormats/filters/ooxml/tests/word/WordPlain.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/cd6ccd0e/DocFormats/filters/ooxml/tests/word/WordPlain.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/tests/word/WordPlain.c b/DocFormats/filters/ooxml/tests/word/WordPlain.c
index ffbbe8a..b1f4d4b 100644
--- a/DocFormats/filters/ooxml/tests/word/WordPlain.c
+++ b/DocFormats/filters/ooxml/tests/word/WordPlain.c
@@ -107,10 +107,12 @@ static char *computeDocumentRelsPath(const char *documentPath)
return documentRelsPath;
}
-static void parseDocumentRels(DFDocument *relsDoc, DFHashTable *rels, DFError **error)
+static void parseDocumentRels(const char *documentPath, DFDocument *relsDoc, DFHashTable *rels, DFError **error)
{
if (relsDoc == NULL)
return;
+ const char *basePrefix = (documentPath[0] == '/') ? "" : "/";
+ char *basePath = DFFormatString("%s%s",basePrefix,documentPath);
for (DFNode *child = relsDoc->root->first; child != NULL; child = child->next) {
if (child->tag != REL_RELATIONSHIP)
continue;
@@ -119,8 +121,11 @@ static void parseDocumentRels(DFDocument *relsDoc, DFHashTable *rels, DFError **
if ((type == NULL) || (target == NULL))
continue;
- DFHashTableAdd(rels,type,target);
+ char *absTarget = DFPathResolveAbsolute(basePath,target);
+ DFHashTableAdd(rels,type,absTarget);
+ free(absTarget);
}
+ free(basePath);
}
static int addRelatedDoc(DFHashTable *parts, DFHashTable *documentRels, const char *relName, const char *filename,
@@ -257,7 +262,7 @@ static char *Word_toPlainFromDir(DFStorage *storage, DFHashTable *parts, DFError
goto end;
}
- parseDocumentRels(relsDoc,rels,error);
+ parseDocumentRels(documentPath,relsDoc,rels,error);
if (!processParts(parts,documentPath,relsDoc,rels,output,storage,error))
goto end;
[02/33] incubator-corinthia git commit: Completed fetch_downloads
extract_downloads pairing
Posted by ja...@apache.org.
Completed fetch_downloads extract_downloads pairing
The procedures work together and extract_downloads always calls
fetch_downloads just in case needed (already-downloaded files are not
refetched). Basic tests are successful.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/a4852151
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/a4852151
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/a4852151
Branch: refs/heads/experiment64
Commit: a48521515f567038768287d67448cb5748ae3df3
Parents: 1384664
Author: Dennis Hamilton <or...@apache.org>
Authored: Fri Jan 2 17:09:25 2015 -0800
Committer: Dennis Hamilton <or...@apache.org>
Committed: Fri Jan 2 17:09:42 2015 -0800
----------------------------------------------------------------------
external/extract_downloads.bat | 15 +++++++++------
external/fetch_downloads.bat | 27 +++++++++++++++++----------
2 files changed, 26 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/a4852151/external/extract_downloads.bat
----------------------------------------------------------------------
diff --git a/external/extract_downloads.bat b/external/extract_downloads.bat
index 4157a8e..a431567 100644
--- a/external/extract_downloads.bat
+++ b/external/extract_downloads.bat
@@ -1,5 +1,5 @@
@echo off
-rem extract_downloads.bat 1.00 UTF-8
+rem extract_downloads.bat 1.01 UTF-8
rem EXTRACT THE EXTERNAL DOWNLOADS TO INCLUDE, LIB, AND BIN FOLDERS
rem Fetch downloads in case not done yet
@@ -21,6 +21,7 @@ CALL :CLEAN
rem For extractions, use the zip name listed and the path, if any, from the
rem root of the zipped hierarchy to the level where include and libs are found
+rem File Name Top Path
CALL :SDL2x86 SDL2-devel-2.0.3-VC.zip SDL2-2.0.3\
CALL :SDL2x86 SDL2_image-devel-2.0.0-VC.zip SDL2_image-2.0.0\
CALL :ICONV iconv-1.9.2.win32.zip iconv-1.9.2.win32\
@@ -29,7 +30,7 @@ CALL :ZLIB zlib128-dll.zip ""
EXIT /B 0
-rem MOST MAINTENANCE IS BY UPDATING THE FILENAMES AND TOP PATHES ABOVE.
+rem MOST MAINTENANCE IS BY UPDATING THE FILENAMES AND TOP PATHS ABOVE.
rem The extraction procedure do not require maintenance unless there is
rem a Zip layout change or new extraction cases are needed.
@@ -77,7 +78,7 @@ EXIT /B 0
rem EXTRACT ALL OF ZIP "%~dp0download\%1" TO "%~dp0download\T"
rem "%~dp0download\T" is not deleted until needed again, leaving the
rem last one for inspection when trouble-shooting.
-RMDIR /S /Q "%~dp0download\T" >nul
+RMDIR /S /Q "%~dp0download\T" >nul 2>&1
ECHO: extracting %1
Cscript /nologo "%~dp0unzip-win.js" //B "%~dp0download\%1" "%~dp0download\T"
EXIT /B 0
@@ -91,9 +92,9 @@ EXIT /B 2
:CLEAN
rem clean out any previous material and be quiet about it
-RMDIR /S /Q "%~dp0download\include" >nul
-RMDIR /S /Q "%~dp0download\lib" >nul
-RMDIR /S /Q "%~dp0download\bin" >nul
+RMDIR /S /Q "%~dp0download\include" >nul 2>&1
+RMDIR /S /Q "%~dp0download\lib" >nul 2>&1
+RMDIR /S /Q "%~dp0download\bin" >nul 2>&1
rem set up empty include, lib, and bin to receive fresh extractions
MKDIR "%~dp0download\include"
MKDIR "%~dp0download\lib"
@@ -111,6 +112,8 @@ ECHO: *** No extractions have been performed.
ECHO:
EXIT /B 2
+rem 1.01 2015-01-02-17:03 Silence warnings when removing non-existent
+rem directories
rem 1.00 2015-01-02-16:25 Complete Full-Functioning Externals Extraction
rem Delivering the download\include, donwload\lib, and download\bin
rem collections established for the current external downloads.
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/a4852151/external/fetch_downloads.bat
----------------------------------------------------------------------
diff --git a/external/fetch_downloads.bat b/external/fetch_downloads.bat
index 0663217..0d5309b 100644
--- a/external/fetch_downloads.bat
+++ b/external/fetch_downloads.bat
@@ -1,32 +1,39 @@
@echo off
-rem fetch_downloads.bat UTF-8
+rem fetch_downloads.bat 1.00 UTF-8
rem FETCH EXTERNAL ARCHIVES FOR NATIVE WINDOWS BUILDS OF CORINTHIA
-mkdir %~dp0download
+MKDIR "%~dp0download" >nul 2>&1
rem Make download directory at same location as this script.
-rem It does not matter if the directory already exists.
+rem Be silent even if the directory already exists. No worries.
-rem MAINTAIN THIS LIST MANUALLY
+rem MAINTAIN THIS LIST MANUALLY. MATCH UP IN EXTRACT_DOWNLOADS.BAT
CALL :FETCH "http://zlib.net/zlib128-dll.zip"
CALL :FETCH "http://xmlsoft.org/sources/win32/iconv-1.9.2.win32.zip"
CALL :FETCH "http://xmlsoft.org/sources/win32/libxml2-2.7.8.win32.zip"
CALL :FETCH "https://www.libsdl.org/release/SDL2-devel-2.0.3-VC.zip"
CALL :FETCH "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-devel-2.0.0-VC.zip"
EXIT /B 0
+
+:FETCH
+IF EXIST "%~dp0download\%~n1%~x1" EXIT /B 0
+rem do not download an archive that is already present.
+Cscript /nologo "%~dp0wget-win.js" //B "%1" "%~dp0download\%~n1%~x1"
+IF EXIST "%~dp0download\%~n1%~x1" ECHO: %~n1%~x1% downloaded
+EXIT /B 0
+
rem TODO
rem * Might want to pass up and act on error codes from the individual
rem :FETCH operations.
rem * It might be handy to fetch these URLs from a file so that it can
rem be kept maintained in one place, even though the win32 cases are
rem unique to building for Windows.
+rem * Silent the warning on download folder already existing
rem XXX
rem * wget-win.js does not do FTP. So alternative locations have been
rem used for iconv and libmxl2.
-:FETCH
-IF EXIST "%~dp0download\%~n1%~x1" EXIT /B 0
-rem do not download an archive that is already present.
-ECHO "%~n1%~x1"
-Cscript /nologo "%~dp0wget-win.js" //B "%1" "%~dp0download\%~n1%~x1"
-EXIT /B 0
+rem 1.00 2015-01-02-16:51 Complete with mating to extract_downloads.bat
+rem The tested version is adjusted to list successful downloads
+rem and not any that are not needed or fail.
+rem *** end of fetch_downloads.bat ***
[23/33] incubator-corinthia git commit: Take ATTRIBUTE_FORMAT macros
back out of DFError.h
Posted by ja...@apache.org.
Take ATTRIBUTE_FORMAT macros back out of DFError.h
This macro is in DFPlatform.h, which all source files include. However
there was a build failure on OS X, which turned out to be the two
Objective C files (FunctionTests.m and StringTests.m) which did not have
the DFPlatform.h include.
Both files now have this include, so the macro does not need to repeated
in DFError.h.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/8f24246e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/8f24246e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/8f24246e
Branch: refs/heads/experiment64
Commit: 8f24246ea1bb005127550a8a32c2277d0de247ba
Parents: 2383716
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Mon Jan 12 06:13:43 2015 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Mon Jan 12 06:14:49 2015 +0700
----------------------------------------------------------------------
DocFormats/api/headers/DocFormats/DFError.h | 10 ----------
DocFormats/filters/odf/src/text/ODFText.c | 1 +
consumers/dfutil/src/FunctionTests.m | 1 +
consumers/dfutil/src/StringTests.m | 1 +
4 files changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8f24246e/DocFormats/api/headers/DocFormats/DFError.h
----------------------------------------------------------------------
diff --git a/DocFormats/api/headers/DocFormats/DFError.h b/DocFormats/api/headers/DocFormats/DFError.h
index 2876007..1742d98 100644
--- a/DocFormats/api/headers/DocFormats/DFError.h
+++ b/DocFormats/api/headers/DocFormats/DFError.h
@@ -17,16 +17,6 @@
#include <stdarg.h>
-// It's really not nice having this here, but is the only way to get the compiler to typecheck the
-// DFErrorFormat arguments when such functionality is available.
-#ifndef ATTRIBUTE_FORMAT
-#ifdef _MSC_VER
-#define ATTRIBUTE_FORMAT(archetype,index,first)
-#else
-#define ATTRIBUTE_FORMAT(archetype,index,first) __attribute__((format(archetype,index,first)))
-#endif
-#endif
-
typedef struct DFError DFError;
void DFErrorSetPosix(DFError **error, int code);
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8f24246e/DocFormats/filters/odf/src/text/ODFText.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/text/ODFText.c b/DocFormats/filters/odf/src/text/ODFText.c
index 6986499..8e94ee9 100644
--- a/DocFormats/filters/odf/src/text/ODFText.c
+++ b/DocFormats/filters/odf/src/text/ODFText.c
@@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "DFPlatform.h"
#include "ODFText.h"
DFDocument *ODFTextGet(DFStorage *concreteStorage, DFStorage *abstractStorage, DFError **error)
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8f24246e/consumers/dfutil/src/FunctionTests.m
----------------------------------------------------------------------
diff --git a/consumers/dfutil/src/FunctionTests.m b/consumers/dfutil/src/FunctionTests.m
index f458cc3..97d8312 100644
--- a/consumers/dfutil/src/FunctionTests.m
+++ b/consumers/dfutil/src/FunctionTests.m
@@ -13,6 +13,7 @@
// limitations under the License.
#import <Foundation/Foundation.h>
+#include "DFPlatform.h"
#include "FunctionTests.h"
#include "DFString.h"
#include "DFFilesystem.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8f24246e/consumers/dfutil/src/StringTests.m
----------------------------------------------------------------------
diff --git a/consumers/dfutil/src/StringTests.m b/consumers/dfutil/src/StringTests.m
index 7e16c51..992d042 100644
--- a/consumers/dfutil/src/StringTests.m
+++ b/consumers/dfutil/src/StringTests.m
@@ -13,6 +13,7 @@
// limitations under the License.
#import <Foundation/Foundation.h>
+#include "DFPlatform.h"
#include "StringTests.h"
#include "DFString.h"
[07/33] incubator-corinthia git commit: Change location of external
extractions
Posted by ja...@apache.org.
Change location of external extractions
The extract_downloads.bat script used folders within external/download
for include, lib, and bin. The simplest correction was to change
CMakeLists.txt to agree rather than make many more fixes to
extract_downloads.bat.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/f058c02a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/f058c02a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/f058c02a
Branch: refs/heads/experiment64
Commit: f058c02a0100dc16f868745594788e96e1c84282
Parents: 2d96374
Author: Dennis Hamilton <or...@apache.org>
Authored: Fri Jan 9 14:43:30 2015 -0800
Committer: Dennis Hamilton <or...@apache.org>
Committed: Fri Jan 9 14:43:30 2015 -0800
----------------------------------------------------------------------
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f058c02a/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d1d41a..7eb3585 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,9 +42,9 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set(INCLUDE_DIRS
- ${PROJECT_SOURCE_DIR}/external/include)
+ ${PROJECT_SOURCE_DIR}/external/download/include)
set(LIB_DIRS
- ${PROJECT_SOURCE_DIR}/external/lib)
+ ${PROJECT_SOURCE_DIR}/external/download/lib)
set(LIBS ${LIBS} libxml2 zdll iconv SDL2 SDL2_image)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4090 /wd4996")
endif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
[20/33] incubator-corinthia git commit: Word: Move WordConverter{Get,
Put}2 code
Posted by ja...@apache.org.
Word: Move WordConverter{Get,Put}2 code
Previously, the functions WordConverterGet and WordConverterPut would
simply create a WordConverter object and then call through to the '2'
version of the same function.
Given that there's little in the way of error handling that needs to
happen in the latter, it makes sense to do it all in one function.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/1706df12
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/1706df12
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/1706df12
Branch: refs/heads/experiment64
Commit: 1706df12c1de93580e427a409a79f669c0e71c99
Parents: bc6827f
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Sun Jan 11 12:54:32 2015 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Sun Jan 11 12:55:57 2015 +0700
----------------------------------------------------------------------
.../filters/ooxml/src/word/WordConverter.c | 55 +++++++++-----------
1 file changed, 24 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/1706df12/DocFormats/filters/ooxml/src/word/WordConverter.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordConverter.c b/DocFormats/filters/ooxml/src/word/WordConverter.c
index f649d26..7e8f2ca 100644
--- a/DocFormats/filters/ooxml/src/word/WordConverter.c
+++ b/DocFormats/filters/ooxml/src/word/WordConverter.c
@@ -674,21 +674,26 @@ DFNode *WordConverterGetConcrete(WordPutData *put, DFNode *abstract)
return node;
}
-static int WordConverterGet2(WordConverter *converter, DFError **error)
+int WordConverterGet(DFDocument *html, DFStorage *abstractStorage,
+ const char *idPrefix, WordPackage *package,
+ DFError **error)
{
- converter->haveFields = Word_simplifyFields(converter->package);
- Word_mergeRuns(converter->package);
- if (converter->package->document == NULL) {
+ if (package->document == NULL) {
DFErrorFormat(error,"document.xml not found");
return 0;
}
- DFNode *wordDocument = DFChildWithTag(converter->package->document->docNode,WORD_DOCUMENT);
+ DFNode *wordDocument = DFChildWithTag(package->document->docNode,WORD_DOCUMENT);
if (wordDocument == NULL) {
DFErrorFormat(error,"word:document not found");
return 0;
}
+ int haveFields = Word_simplifyFields(package);
+ Word_mergeRuns(package);
+
+ WordConverter *converter = WordConverterNew(html,abstractStorage,idPrefix,package);
+ converter->haveFields = haveFields;
WordAddNbsps(converter->package->document);
WordFixLists(converter);
@@ -711,20 +716,12 @@ static int WordConverterGet2(WordConverter *converter, DFError **error)
HTML_safeIndent(converter->html->docNode,0);
+ int ok = 1;
if (converter->warnings->len > 0) {
DFErrorFormat(error,"%s",converter->warnings->data);
- return 0;
+ ok = 0;
}
- return 1;
-}
-
-int WordConverterGet(DFDocument *html, DFStorage *abstractStorage,
- const char *idPrefix, WordPackage *package,
- DFError **error)
-{
- WordConverter *converter = WordConverterNew(html,abstractStorage,idPrefix,package);
- int ok = WordConverterGet2(converter,error);
WordConverterFree(converter);
return ok;
}
@@ -813,22 +810,26 @@ static void addMissingDefaultStyles(WordConverter *converter)
}
}
-static int WordConverterPut2(WordConverter *converter, DFError **error)
+int WordConverterPut(DFDocument *html, DFStorage *abstractStorage,
+ const char *idPrefix, WordPackage *package,
+ DFError **error)
{
- HTML_normalizeDocument(converter->html);
- HTML_pushDownInlineProperties(converter->html->docNode);
-
- if (converter->package->document == NULL) {
+ if (package->document == NULL) {
DFErrorFormat(error,"document.xml not found");
return 0;
}
- DFNode *wordDocument = DFChildWithTag(converter->package->document->docNode,WORD_DOCUMENT);
+ DFNode *wordDocument = DFChildWithTag(package->document->docNode,WORD_DOCUMENT);
if (wordDocument == NULL) {
DFErrorFormat(error,"word:document not found");
return 0;
}
+ HTML_normalizeDocument(html);
+ HTML_pushDownInlineProperties(html->docNode);
+
+ WordConverter *converter = WordConverterNew(html,abstractStorage,idPrefix,package);
+
// FIXME: Need a more reliable way of telling whether this is a new document or not - it could be that the
// document already existed (with styles set up) but did not have any content
DFNode *wordBody = DFChildWithTag(wordDocument,WORD_BODY);
@@ -906,20 +907,12 @@ static int WordConverterPut2(WordConverter *converter, DFError **error)
DFHashTableRelease(put.numIdByHtmlId);
DFHashTableRelease(put.htmlIdByNumId);
+ int ok = 1;
if (converter->warnings->len > 0) {
DFErrorFormat(error,"%s",converter->warnings->data);
- return 0;
+ ok = 0;
}
- return 1;
-}
-
-int WordConverterPut(DFDocument *html, DFStorage *abstractStorage,
- const char *idPrefix, WordPackage *package,
- DFError **error)
-{
- WordConverter *converter = WordConverterNew(html,abstractStorage,idPrefix,package);
- int ok = WordConverterPut2(converter,error);
WordConverterFree(converter);
return ok;
}
[08/33] incubator-corinthia git commit: Don't include on
non-Windows platforms
Posted by ja...@apache.org.
Don't include <io.h> on non-Windows platforms
The <io.h> system header is only avilable on windows. It was
unconditionally included in DFFilesystem.c, which broke the build on
Linux and OS X. It used to be wrapped in an #ifdef WIN32 but with the
removal of this, it was already included.
I have now moved the #include <io.h> to DFPlatform.h, where there is an
ifdef in place to distinguish between WIN32 and other platforms, so that
we don't get a compile error when this is built on Linux and OS X.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/3f11aefa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/3f11aefa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/3f11aefa
Branch: refs/heads/experiment64
Commit: 3f11aefa27314b66eee44b14561cf3514a061537
Parents: f058c02
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Sun Jan 11 00:10:00 2015 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Sun Jan 11 00:10:00 2015 +0700
----------------------------------------------------------------------
DocFormats/core/src/lib/DFFilesystem.c | 1 -
DocFormats/headers/DFPlatform.h | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/3f11aefa/DocFormats/core/src/lib/DFFilesystem.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFFilesystem.c b/DocFormats/core/src/lib/DFFilesystem.c
index 41a9f28..972941b 100644
--- a/DocFormats/core/src/lib/DFFilesystem.c
+++ b/DocFormats/core/src/lib/DFFilesystem.c
@@ -27,7 +27,6 @@
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
-#include <io.h>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/3f11aefa/DocFormats/headers/DFPlatform.h
----------------------------------------------------------------------
diff --git a/DocFormats/headers/DFPlatform.h b/DocFormats/headers/DFPlatform.h
index ea517e7..3d4ae0b 100755
--- a/DocFormats/headers/DFPlatform.h
+++ b/DocFormats/headers/DFPlatform.h
@@ -17,6 +17,7 @@
#ifdef WIN32
#include <direct.h>
+#include <io.h>
#define _CRT_SECURE_NO_WARNINGS
#define snprintf _snprintf
[17/33] incubator-corinthia git commit: Remove include
Posted by ja...@apache.org.
Remove <io.h> include
This was needed at one point, but I can't remember what for. It's no
longer required; the code builds fine without it.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/d785d58d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/d785d58d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/d785d58d
Branch: refs/heads/experiment64
Commit: d785d58d96bc807c7546f683a860b5a8c7c6d3aa
Parents: ce0e3d5
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Sun Jan 11 10:24:39 2015 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Sun Jan 11 10:24:39 2015 +0700
----------------------------------------------------------------------
DocFormats/headers/DFPlatform.h | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/d785d58d/DocFormats/headers/DFPlatform.h
----------------------------------------------------------------------
diff --git a/DocFormats/headers/DFPlatform.h b/DocFormats/headers/DFPlatform.h
index 3d4ae0b..ea517e7 100755
--- a/DocFormats/headers/DFPlatform.h
+++ b/DocFormats/headers/DFPlatform.h
@@ -17,7 +17,6 @@
#ifdef WIN32
#include <direct.h>
-#include <io.h>
#define _CRT_SECURE_NO_WARNINGS
#define snprintf _snprintf
[32/33] incubator-corinthia git commit: Remove Precompiled Headers
from Repository
Posted by ja...@apache.org.
Remove Precompiled Headers from Repository
File dfutil-Prefix.pch is a platform-specific precompiled Header file
that is a hangover from before *.pch being added to .gitignore.
Precompiled headers are probably not important for these small compiles.
They should probably only occur in build/ even then, and not be carried
in the public repo.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/e9215776
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/e9215776
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/e9215776
Branch: refs/heads/experiment64
Commit: e9215776c1c22d140d765abc0c31e478da712034
Parents: f9214c4
Author: Dennis Hamilton <or...@apache.org>
Authored: Thu Feb 12 20:51:36 2015 -0800
Committer: Dennis Hamilton <or...@apache.org>
Committed: Thu Feb 12 20:51:36 2015 -0800
----------------------------------------------------------------------
consumers/dfutil/src/dfutil-Prefix.pch | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/e9215776/consumers/dfutil/src/dfutil-Prefix.pch
----------------------------------------------------------------------
diff --git a/consumers/dfutil/src/dfutil-Prefix.pch b/consumers/dfutil/src/dfutil-Prefix.pch
deleted file mode 100644
index a0d2737..0000000
--- a/consumers/dfutil/src/dfutil-Prefix.pch
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// Prefix header for all source files of the 'dom' target in the 'dom' project
-//
-
-#ifdef __OBJC__
- #import <Foundation/Foundation.h>
-#endif
[22/33] incubator-corinthia git commit: ODF: Skeleton functions for
get/put/create
Posted by ja...@apache.org.
ODF: Skeleton functions for get/put/create
These match their counterparts in filters/ooxml/src/word/Word.c
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/23837161
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/23837161
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/23837161
Branch: refs/heads/experiment64
Commit: 23837161eaa9cf88b02451095604bb78d7514683
Parents: 2230024
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Sun Jan 11 14:04:43 2015 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Sun Jan 11 14:04:43 2015 +0700
----------------------------------------------------------------------
DocFormats/api/CMakeLists.txt | 1 +
DocFormats/api/src/Operations.c | 10 ++++++++
DocFormats/filters/odf/CMakeLists.txt | 10 ++++++--
DocFormats/filters/odf/src/text/ODFText.c | 33 ++++++++++++++++++++++++++
DocFormats/filters/odf/src/text/ODFText.h | 26 ++++++++++++++++++++
5 files changed, 78 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/23837161/DocFormats/api/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/api/CMakeLists.txt b/DocFormats/api/CMakeLists.txt
index e0146ef..148be77 100644
--- a/DocFormats/api/CMakeLists.txt
+++ b/DocFormats/api/CMakeLists.txt
@@ -56,6 +56,7 @@ include_directories(../core/src/names)
include_directories(../core/src/xml)
include_directories(../filters/latex/src)
include_directories(../filters/odf/src)
+include_directories(../filters/odf/src/text)
include_directories(../filters/ooxml/src/common)
include_directories(../filters/ooxml/src/word)
include_directories(../filters/ooxml/src/word/formatting)
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/23837161/DocFormats/api/src/Operations.c
----------------------------------------------------------------------
diff --git a/DocFormats/api/src/Operations.c b/DocFormats/api/src/Operations.c
index 18575cd..3b4500f 100644
--- a/DocFormats/api/src/Operations.c
+++ b/DocFormats/api/src/Operations.c
@@ -18,6 +18,7 @@
#include "DFString.h"
#include <DocFormats/DFStorage.h>
#include "Word.h"
+#include "ODFText.h"
#include "DFHTML.h"
#include "DFDOM.h"
#include "DFXML.h"
@@ -153,6 +154,9 @@ int DFGet(DFConcreteDocument *concrete, DFAbstractDocument *abstract, DFError **
case DFFileFormatDocx:
htmlDoc = WordGet(concrete->storage,abstract->storage,error);
break;
+ case DFFileFormatOdt:
+ htmlDoc = ODFTextGet(concrete->storage,abstract->storage,error);
+ break;
default:
DFErrorFormat(error,"Unsupported file format");
break;
@@ -178,6 +182,9 @@ int DFPut(DFConcreteDocument *concreteDoc, DFAbstractDocument *abstractDoc, DFEr
case DFFileFormatDocx:
ok = WordPut(concreteDoc->storage,abstractDoc->storage,abstractDoc->htmlDoc,error);
break;
+ case DFFileFormatOdt:
+ ok = ODFTextPut(concreteDoc->storage,abstractDoc->storage,abstractDoc->htmlDoc,error);
+ break;
default:
DFErrorFormat(error,"Unsupported file format");
break;
@@ -197,6 +204,9 @@ int DFCreate(DFConcreteDocument *concreteDoc, DFAbstractDocument *abstractDoc, D
case DFFileFormatDocx:
ok = WordCreate(concreteDoc->storage,abstractDoc->storage,abstractDoc->htmlDoc,error);
break;
+ case DFFileFormatOdt:
+ ok = ODFTextCreate(concreteDoc->storage,abstractDoc->storage,abstractDoc->htmlDoc,error);
+ break;
default:
DFErrorFormat(error,"Unsupported file format");
break;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/23837161/DocFormats/filters/odf/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/CMakeLists.txt b/DocFormats/filters/odf/CMakeLists.txt
index 7787ad6..b38a965 100644
--- a/DocFormats/filters/odf/CMakeLists.txt
+++ b/DocFormats/filters/odf/CMakeLists.txt
@@ -25,6 +25,10 @@ set(GroupSrc
src/ODFSheet.c
src/ODFSheet.h)
+set(GroupSrcText
+ src/text/ODFText.h
+ src/text/ODFText.c)
+
set(GroupTests
tests/ODFTests.c)
@@ -62,7 +66,9 @@ include_directories(../../unittest)
###
add_library(odf OBJECT
${GroupSrc}
+ ${GroupSrcText}
${GroupTests})
-source_group(src FILES ${GroupSrc})
-source_group(tests FILES ${GroupTests})
+source_group(src FILES ${GroupSrc})
+source_group(src\\text FILES ${GroupSrcText})
+source_group(tests FILES ${GroupTests})
set_property(TARGET odf PROPERTY FOLDER DocFormats/filters)
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/23837161/DocFormats/filters/odf/src/text/ODFText.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/text/ODFText.c b/DocFormats/filters/odf/src/text/ODFText.c
new file mode 100644
index 0000000..6986499
--- /dev/null
+++ b/DocFormats/filters/odf/src/text/ODFText.c
@@ -0,0 +1,33 @@
+// Copyright 2012-2014 UX Productivity Pty Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "ODFText.h"
+
+DFDocument *ODFTextGet(DFStorage *concreteStorage, DFStorage *abstractStorage, DFError **error)
+{
+ DFErrorFormat(error,"ODFTextGet: Not yet implemented");
+ return NULL;
+}
+
+int ODFTextPut(DFStorage *concreteStorage, DFStorage *abstractStorage, DFDocument *htmlDoc, DFError **error)
+{
+ DFErrorFormat(error,"ODFTextPut: Not yet implemented");
+ return 0;
+}
+
+int ODFTextCreate(DFStorage *concreteStorage, DFStorage *abstractStorage, DFDocument *htmlDoc, DFError **error)
+{
+ DFErrorFormat(error,"ODFTextCreate: Not yet implemented");
+ return 0;
+}
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/23837161/DocFormats/filters/odf/src/text/ODFText.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/text/ODFText.h b/DocFormats/filters/odf/src/text/ODFText.h
new file mode 100644
index 0000000..16f0e5a
--- /dev/null
+++ b/DocFormats/filters/odf/src/text/ODFText.h
@@ -0,0 +1,26 @@
+// Copyright 2012-2014 UX Productivity Pty Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef DocFormats_ODFText_h
+#define DocFormats_ODFText_h
+
+#include <DocFormats/DFError.h>
+#include <DocFormats/DFStorage.h>
+#include <DocFormats/DFXMLForward.h>
+
+DFDocument *ODFTextGet(DFStorage *concreteStorage, DFStorage *abstractStorage, DFError **error);
+int ODFTextPut(DFStorage *concreteStorage, DFStorage *abstractStorage, DFDocument *htmlDoc, DFError **error);
+int ODFTextCreate(DFStorage *concreteStorage, DFStorage *abstractStorage, DFDocument *htmlDoc, DFError **error);
+
+#endif
[03/33] incubator-corinthia git commit: Add .gitattributes
Posted by ja...@apache.org.
Add .gitattributes
The Git attributes are set to adjust line endings between different
clients and the repository form (usually Unix NL instead of CR-LF).
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/2d374505
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/2d374505
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/2d374505
Branch: refs/heads/experiment64
Commit: 2d3745056c41dd0d45484b07580b97713e1dcf52
Parents: a485215
Author: Dennis Hamilton <or...@apache.org>
Authored: Wed Jan 7 11:49:26 2015 -0800
Committer: Dennis Hamilton <or...@apache.org>
Committed: Wed Jan 7 11:49:26 2015 -0800
----------------------------------------------------------------------
.gitattributes | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/2d374505/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..a77dbf0
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,25 @@
+# .gitattributes UTF-8
+#
+# GIT ATTRIBUTES FOR THE CORINTHIA GIT REPOSITORY
+
+# Set the default behavior in case people don't have core.autocrlf set.
+# This will automatically convert between line-ending style of the client
+# and whatever line-ending style that is found in the repository. (On the
+# client, always use a Git package that is compiled for the native OS.)
+
+* text=auto
+# This declares files to be text by default and to be line-ending alterable.
+# Be careful. See the group below.
+
+# Denote all files that are truly binary and must not be scanned for line-end.
+# Some of these might also be .gitignored. Better safe than sorry.
+
+*.bmp binary
+*.jpg binary
+*.png binary
+*.suo binary
+*.zip binary
+
+# *** end of .gitattributes ***
+
+
[13/33] incubator-corinthia git commit: Shut git up about CRLF issues
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1715153.html
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1715153.html b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1715153.html
index cf84eaa..faa86d7 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1715153.html
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1715153.html
@@ -1,12 +1,12 @@
-<embed
-allowScriptAccess="never"
-src="qqq"
-quality="high"
-mode="transparent"
-bgcolor="FFFFFF"
-width="330"
-height="220"
-lign="middle"
-allowScriptAccess="sameDomain"
-type="application/x-shockwave-flash"
-pluginspage="http://www.macromedia.com/go/getflashplayer" />
+<embed
+allowScriptAccess="never"
+src="qqq"
+quality="high"
+mode="transparent"
+bgcolor="FFFFFF"
+width="330"
+height="220"
+lign="middle"
+allowScriptAccess="sameDomain"
+type="application/x-shockwave-flash"
+pluginspage="http://www.macromedia.com/go/getflashplayer" />
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_2705873-1.html
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_2705873-1.html b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_2705873-1.html
index 4f357b7..1515095 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_2705873-1.html
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_2705873-1.html
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <title>Virtual Library</title>
- </head>
- <body>
- <p>Moved to <a href="http://example.org/">example.org</a>.</p>
-
- </body>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <title>Virtual Library</title>
+ </head>
+ <body>
+ <p>Moved to <a href="http://example.org/">example.org</a>.</p>
+
+ </body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_2709860.html
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_2709860.html b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_2709860.html
index ae62b7e..2837533 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_2709860.html
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_2709860.html
@@ -1,16 +1,16 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
-<title></title>
-</head>
-<body>
-<table summary="">
-<tr>
-<th> Topic </th>
-<th rowspan=2> version </th>
-<th abbr="Type"> Plugins/standalone ?</th>
-<th> Foobar </th>
-</tr>
-</table>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+<head>
+<title></title>
+</head>
+<body>
+<table summary="">
+<tr>
+<th> Topic </th>
+<th rowspan=2> version </th>
+<th abbr="Type"> Plugins/standalone ?</th>
+<th> Foobar </th>
+</tr>
+</table>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_586562.html
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_586562.html b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_586562.html
index 1c0b9fe..53e3062 100644
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_586562.html
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_586562.html
@@ -1,12 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
- <meta content="text/html;charset=iso-8859-1" http-equiv="Content-Type">
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
- <meta content="Microsoft FrontPage 4.0" name="GENERATOR">
- <title>[586562] Two Doctypes</title>
-</head>
-<body>
- <p>Two DOCTYPE's!</p>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+ <meta content="text/html;charset=iso-8859-1" http-equiv="Content-Type">
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <meta content="Microsoft FrontPage 4.0" name="GENERATOR">
+ <title>[586562] Two Doctypes</title>
+</head>
+<body>
+ <p>Two DOCTYPE's!</p>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_795643-1.html
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_795643-1.html b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_795643-1.html
index 0902f05..98d12dd 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_795643-1.html
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_795643-1.html
@@ -1 +1 @@
-<p>Hi</p>
+<p>Hi</p>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_795643-2.html
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_795643-2.html b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_795643-2.html
index 7fdd496..287ec04 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_795643-2.html
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_795643-2.html
@@ -1 +1 @@
-<body><p>Hi</p>
+<body><p>Hi</p>
[33/33] incubator-corinthia git commit: changed license for platform
Posted by ja...@apache.org.
changed license for platform
Removed copyright notice
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/8fbfecab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/8fbfecab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/8fbfecab
Branch: refs/heads/experiment64
Commit: 8fbfecab56fd91d7f327646632dfda6523e41c3b
Parents: e921577
Author: jani <ja...@apache.org>
Authored: Fri Feb 13 09:18:59 2015 +0100
Committer: jani <ja...@apache.org>
Committed: Fri Feb 13 09:18:59 2015 +0100
----------------------------------------------------------------------
DocFormats/platform/src/Apple.c | 25 ++++++++++++++-----------
DocFormats/platform/src/Linux.c | 25 ++++++++++++++-----------
DocFormats/platform/src/Unix.c | 25 ++++++++++++++-----------
DocFormats/platform/src/Win32.c | 25 ++++++++++++++-----------
DocFormats/platform/src/Wrapper.c | 26 +++++++++++++++-----------
DocFormats/platform/tests/OStests.c | 25 ++++++++++++++-----------
DocFormats/platform/tests/WrapperTests.c | 26 +++++++++++++++-----------
7 files changed, 100 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8fbfecab/DocFormats/platform/src/Apple.c
----------------------------------------------------------------------
diff --git a/DocFormats/platform/src/Apple.c b/DocFormats/platform/src/Apple.c
index 3c9d130..576743f 100644
--- a/DocFormats/platform/src/Apple.c
+++ b/DocFormats/platform/src/Apple.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8fbfecab/DocFormats/platform/src/Linux.c
----------------------------------------------------------------------
diff --git a/DocFormats/platform/src/Linux.c b/DocFormats/platform/src/Linux.c
index 5d93518..8f01264 100644
--- a/DocFormats/platform/src/Linux.c
+++ b/DocFormats/platform/src/Linux.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8fbfecab/DocFormats/platform/src/Unix.c
----------------------------------------------------------------------
diff --git a/DocFormats/platform/src/Unix.c b/DocFormats/platform/src/Unix.c
index 00c8438..a739875 100644
--- a/DocFormats/platform/src/Unix.c
+++ b/DocFormats/platform/src/Unix.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include <errno.h>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8fbfecab/DocFormats/platform/src/Win32.c
----------------------------------------------------------------------
diff --git a/DocFormats/platform/src/Win32.c b/DocFormats/platform/src/Win32.c
index f17303e..6ac5215 100755
--- a/DocFormats/platform/src/Win32.c
+++ b/DocFormats/platform/src/Win32.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8fbfecab/DocFormats/platform/src/Wrapper.c
----------------------------------------------------------------------
diff --git a/DocFormats/platform/src/Wrapper.c b/DocFormats/platform/src/Wrapper.c
index 14ed093..1c0d897 100644
--- a/DocFormats/platform/src/Wrapper.c
+++ b/DocFormats/platform/src/Wrapper.c
@@ -1,16 +1,20 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
#include <string.h>
#include <stdlib.h>
#include "DFPlatform.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8fbfecab/DocFormats/platform/tests/OStests.c
----------------------------------------------------------------------
diff --git a/DocFormats/platform/tests/OStests.c b/DocFormats/platform/tests/OStests.c
index a1f430a..27aafe4 100644
--- a/DocFormats/platform/tests/OStests.c
+++ b/DocFormats/platform/tests/OStests.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFUnitTest.h"
#include "DFPlatform.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8fbfecab/DocFormats/platform/tests/WrapperTests.c
----------------------------------------------------------------------
diff --git a/DocFormats/platform/tests/WrapperTests.c b/DocFormats/platform/tests/WrapperTests.c
index f2a8f2b..5f5d74b 100644
--- a/DocFormats/platform/tests/WrapperTests.c
+++ b/DocFormats/platform/tests/WrapperTests.c
@@ -1,16 +1,20 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
#include "DFUnitTest.h"
#include <stddef.h>
[12/33] incubator-corinthia git commit: Get rid of DFCreateTempDir
Posted by ja...@apache.org.
Get rid of DFCreateTempDir
For a number of operations, like running tests and converting documents,
we used to require the existence of a temporary directory into which we
could extract the contents of a .docx or other zip-based package.
However, since the implementation of the DFStorage interface, with both
an in-memory implementation, and a zip-based implementation, it's no
longer necessary to write the XML files from a zip package out to the
filesystem.
DFCreateTempDir used to rely on mkdtemp, which generates temporary
directories in a secure manner (that is, avoiding a race condition
between the directory's creation time and the application getting
exclusive access to it). However, this function is not available on
windows, leaving us with the choice of having an #ifdef WIN32 to use a
fixed directory name on windows, or doing the same thing on all
platforms. Compiling on Linux would give a warning about the mktemp
function being unsafe.
Given that we don't actually need temporary directories any more for
testing or conversion though, we can just remove this function
altogethter, avoiding this dilemma.
The one place where temporary files are still used is when dftest is run
with the -diff option, which prints out the differences between the
expected and actual results of a test case if there is a failure. This
has been changed to use the fixed filenames 'dftest-diff-from.tmp' and
'dftest-diff-to.tmp' so it can run the diff command as a sub-process.
Another nice advantage of this is when dftest or dfutil crashes, you
don't get a dfutil.XXXXXX directory lying around.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/5204f74e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/5204f74e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/5204f74e
Branch: refs/heads/experiment64
Commit: 5204f74e892e98e5b877a79946b208a2279eed5c
Parents: 22947ef
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Sun Jan 11 01:58:29 2015 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Sun Jan 11 02:08:12 2015 +0700
----------------------------------------------------------------------
DocFormats/core/src/lib/DFFilesystem.c | 16 ----------------
DocFormats/core/src/lib/DFFilesystem.h | 1 -
consumers/dftest/src/main.c | 24 ++++++------------------
consumers/dfutil/src/Commands.c | 23 ++---------------------
4 files changed, 8 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/5204f74e/DocFormats/core/src/lib/DFFilesystem.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFFilesystem.c b/DocFormats/core/src/lib/DFFilesystem.c
index 972941b..66c8a79 100644
--- a/DocFormats/core/src/lib/DFFilesystem.c
+++ b/DocFormats/core/src/lib/DFFilesystem.c
@@ -392,19 +392,3 @@ char *DFRemovePercentEncoding(const char *encoded)
output[outpos] = 0;
return output;
}
-
-
-char *DFCreateTempDir(DFError **error)
-{
- char *ctemplate = strdup("dfutil.XXXXXX");
- char *name = mktemp(ctemplate);
- if (!name) {
- free(ctemplate);
- return NULL;
- }
- if (!DFCreateDirectory(name, 1, error)) {
- free(ctemplate);
- return NULL;
- }
- return name;
-}
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/5204f74e/DocFormats/core/src/lib/DFFilesystem.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFFilesystem.h b/DocFormats/core/src/lib/DFFilesystem.h
index b1536e1..e3e2869 100644
--- a/DocFormats/core/src/lib/DFFilesystem.h
+++ b/DocFormats/core/src/lib/DFFilesystem.h
@@ -34,5 +34,4 @@ char *DFPathWithoutExtension(const char *path);
char *DFPathResolveAbsolute(const char *base, const char *relative);
char *DFPathNormalize(const char *path);
char *DFRemovePercentEncoding(const char *encoded);
-char *DFCreateTempDir(DFError **error);
#endif
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/5204f74e/consumers/dftest/src/main.c
----------------------------------------------------------------------
diff --git a/consumers/dftest/src/main.c b/consumers/dftest/src/main.c
index 1cc1f69..b3fd6b0 100644
--- a/consumers/dftest/src/main.c
+++ b/consumers/dftest/src/main.c
@@ -60,10 +60,10 @@ typedef struct {
int failed;
} TestHarness;
-static int diffResults2(const char *from, const char *to, const char *tempDir, DFError **error)
+static int diffResults(const char *from, const char *to, DFError **error)
{
- char *fromFilename = DFAppendPathComponent(tempDir,"from");
- char *toFilename = DFAppendPathComponent(tempDir,"to");
+ const char *fromFilename = "dftest-diff-from.tmp";
+ const char *toFilename = "dftest-diff-to.tmp";
int result = 0;
if (!DFStringWriteToFile(from,fromFilename,error)) {
DFErrorFormat(error,"%s: %s",fromFilename,DFErrorMessage(error));
@@ -72,25 +72,13 @@ static int diffResults2(const char *from, const char *to, const char *tempDir, D
DFErrorFormat(error,"%s: %s",toFilename,DFErrorMessage(error));
}
else {
- char *cmd = DFFormatString("diff -u %s/from %s/to",tempDir,tempDir);
+ char *cmd = DFFormatString("diff -u %s %s",fromFilename,toFilename);
system(cmd);
free(cmd);
result = 1;
}
- free(fromFilename);
- free(toFilename);
- return result;
-}
-
-static int diffResults(const char *from, const char *to, DFError **error)
-{
- char *tempDir = DFCreateTempDir(error);
- if (tempDir == NULL)
- return 0;
-
- int result = diffResults2(from,to,tempDir,error);
- DFDeleteFile(tempDir,NULL);
- free(tempDir);
+ DFDeleteFile(fromFilename,NULL);
+ DFDeleteFile(toFilename,NULL);
return result;
}
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/5204f74e/consumers/dfutil/src/Commands.c
----------------------------------------------------------------------
diff --git a/consumers/dfutil/src/Commands.c b/consumers/dfutil/src/Commands.c
index f1054d9..530acd2 100644
--- a/consumers/dfutil/src/Commands.c
+++ b/consumers/dfutil/src/Commands.c
@@ -102,17 +102,10 @@ static int prettyPrintXMLFile(const char *filename, int html, DFError **error)
static int prettyPrintWordFile(const char *filename, DFError **error)
{
- char *tempPath = DFCreateTempDir(error);
- if (tempPath == NULL)
- return 0;;
int ok = 0;
- char *wordTempPath = DFAppendPathComponent(tempPath,"word");
char *plain = NULL;
DFStorage *storage = NULL;
- if (!DFEmptyDirectory(wordTempPath,error))
- goto end;
-
storage = DFStorageOpenZip(filename,error);
if (storage == NULL) {
DFErrorFormat(error,"%s: %s",filename,DFErrorMessage(error));
@@ -125,11 +118,8 @@ static int prettyPrintWordFile(const char *filename, DFError **error)
ok = 1;
end:
- free(tempPath);
- free(wordTempPath);
free(plain);
DFStorageRelease(storage);
- DFDeleteFile(tempPath,NULL);
return ok;
}
@@ -151,8 +141,7 @@ int prettyPrintFile(const char *filename, DFError **error)
return ok;
}
-static int fromPlain2(const char *tempPath, const char *inStr, const char *inPath,
- const char *outFilename, DFError **error)
+static int fromPlain2(const char *inStr, const char *inPath, const char *outFilename, DFError **error)
{
char *outExtension = DFPathExtension(outFilename);
int isDocx = DFStringEqualsCI(outExtension,"docx");
@@ -185,17 +174,9 @@ int fromPlain(const char *inFilename, const char *outFilename, DFError **error)
if (inStr == NULL)
return 0;
- char *tempPath = DFCreateTempDir(error);
- if (tempPath == NULL) {
- free(inStr);
- return 0;
- }
-
char *inPath = fromStdin ? strdup(".") : DFPathDirName(inFilename);
- int ok = fromPlain2(tempPath,inStr,inPath,outFilename,error);
- DFDeleteFile(tempPath,NULL);
+ int ok = fromPlain2(inStr,inPath,outFilename,error);
free(inPath);
- free(tempPath);
free(inStr);
return ok;
}
[05/33] incubator-corinthia git commit: external\README.txt
replacement draft
Posted by ja...@apache.org.
external\README.txt replacement draft
A 1.0 Draft of the README is provided in place of the previous one that
referenced the bash scripts. This attempts to cover the essentials with
drill-down into maintenance and customization to be in separate files.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/40fb232e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/40fb232e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/40fb232e
Branch: refs/heads/experiment64
Commit: 40fb232e4fa18eb7eb5c09ca9661a5508c7e2fe5
Parents: 944312a
Author: Dennis Hamilton <or...@apache.org>
Authored: Thu Jan 8 12:26:49 2015 -0800
Committer: Dennis Hamilton <or...@apache.org>
Committed: Thu Jan 8 12:26:49 2015 -0800
----------------------------------------------------------------------
external/README.txt | 287 ++++++++++++++++++++---------------------------
1 file changed, 119 insertions(+), 168 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/40fb232e/external/README.txt
----------------------------------------------------------------------
diff --git a/external/README.txt b/external/README.txt
index 5067bdc..2dc9a6b 100644
--- a/external/README.txt
+++ b/external/README.txt
@@ -1,168 +1,119 @@
-Download external developer libraries to here, and you dont need to modify CMakeList.txt
-
-in order to compile on windows you need:
-
-Zlib developer files:
- http://zlib.net/zlib128-dll.zip
-
-Iconv developer files:
- ftp://ftp.zlatkovic.com/libxml/iconv-1.9.2.win32.zip
-
-libxml2 developer files:
- ftp://ftp.zlatkovic.com/libxml/libxml2-2.7.8.win32.zip
-
-SDL2 developer files:
- https://www.libsdl.org/release/SDL2-devel-2.0.3-VC.zip
-
-SDL2_image developer files:
- https://www.libsdl.org/projects/SDL_image/release/SDL2_image-devel-2.0.0-VC.zip
-
-We are working on reducing these dependencies.
-
-On a Unix system (and possibly under cygwin), you can run the
-fetch_downloads.sh script to download these. The extract_downloads.sh
-script places all the files in the bin, lib, and include
-directories. The result should look like this the listing below.
-
-After building Corinthia, you will need to copy all of the DLL files from
-external/bin into the bin directory within your build directory,
-alongside dfconvert and dftest.
-
-bin/SDL2.dll
-bin/SDL2_image.dll
-bin/iconv.dll
-bin/iconv.exe
-bin/libjpeg-9.dll
-bin/libpng16-16.dll
-bin/libtiff-5.dll
-bin/libwebp-4.dll
-bin/libxml2.dll
-bin/xmlcatalog.exe
-bin/xmllint.exe
-bin/zlib1.dll
-include/SDL.h
-include/SDL_assert.h
-include/SDL_atomic.h
-include/SDL_audio.h
-include/SDL_bits.h
-include/SDL_blendmode.h
-include/SDL_clipboard.h
-include/SDL_config.h
-include/SDL_cpuinfo.h
-include/SDL_endian.h
-include/SDL_error.h
-include/SDL_events.h
-include/SDL_filesystem.h
-include/SDL_gamecontroller.h
-include/SDL_gesture.h
-include/SDL_haptic.h
-include/SDL_hints.h
-include/SDL_image.h
-include/SDL_joystick.h
-include/SDL_keyboard.h
-include/SDL_keycode.h
-include/SDL_loadso.h
-include/SDL_log.h
-include/SDL_main.h
-include/SDL_messagebox.h
-include/SDL_mouse.h
-include/SDL_mutex.h
-include/SDL_name.h
-include/SDL_opengl.h
-include/SDL_opengles.h
-include/SDL_opengles2.h
-include/SDL_pixels.h
-include/SDL_platform.h
-include/SDL_power.h
-include/SDL_quit.h
-include/SDL_rect.h
-include/SDL_render.h
-include/SDL_revision.h
-include/SDL_rwops.h
-include/SDL_scancode.h
-include/SDL_shape.h
-include/SDL_stdinc.h
-include/SDL_surface.h
-include/SDL_system.h
-include/SDL_syswm.h
-include/SDL_test.h
-include/SDL_test_assert.h
-include/SDL_test_common.h
-include/SDL_test_compare.h
-include/SDL_test_crc32.h
-include/SDL_test_font.h
-include/SDL_test_fuzzer.h
-include/SDL_test_harness.h
-include/SDL_test_images.h
-include/SDL_test_log.h
-include/SDL_test_md5.h
-include/SDL_test_random.h
-include/SDL_thread.h
-include/SDL_timer.h
-include/SDL_touch.h
-include/SDL_types.h
-include/SDL_version.h
-include/SDL_video.h
-include/begin_code.h
-include/close_code.h
-include/iconv.h
-include/libxml/DOCBparser.h
-include/libxml/HTMLparser.h
-include/libxml/HTMLtree.h
-include/libxml/SAX.h
-include/libxml/SAX2.h
-include/libxml/c14n.h
-include/libxml/catalog.h
-include/libxml/chvalid.h
-include/libxml/debugXML.h
-include/libxml/dict.h
-include/libxml/encoding.h
-include/libxml/entities.h
-include/libxml/globals.h
-include/libxml/hash.h
-include/libxml/list.h
-include/libxml/nanoftp.h
-include/libxml/nanohttp.h
-include/libxml/parser.h
-include/libxml/parserInternals.h
-include/libxml/pattern.h
-include/libxml/relaxng.h
-include/libxml/schemasInternals.h
-include/libxml/schematron.h
-include/libxml/threads.h
-include/libxml/tree.h
-include/libxml/uri.h
-include/libxml/valid.h
-include/libxml/xinclude.h
-include/libxml/xlink.h
-include/libxml/xmlIO.h
-include/libxml/xmlautomata.h
-include/libxml/xmlerror.h
-include/libxml/xmlexports.h
-include/libxml/xmlmemory.h
-include/libxml/xmlmodule.h
-include/libxml/xmlreader.h
-include/libxml/xmlregexp.h
-include/libxml/xmlsave.h
-include/libxml/xmlschemas.h
-include/libxml/xmlschemastypes.h
-include/libxml/xmlstring.h
-include/libxml/xmlunicode.h
-include/libxml/xmlversion.h
-include/libxml/xmlwriter.h
-include/libxml/xpath.h
-include/libxml/xpathInternals.h
-include/libxml/xpointer.h
-include/zconf.h
-include/zlib.h
-lib/SDL2.lib
-lib/SDL2_image.lib
-lib/SDL2main.lib
-lib/SDL2test.lib
-lib/iconv.lib
-lib/iconv_a.lib
-lib/libxml2.lib
-lib/libxml2_a.lib
-lib/libxml2_a_dll.lib
-lib/zdll.lib
-lib/zlib.def
+README.txt 1.0 UTF-8
+
+ EXTERNAL DOWNLOADS AREA STRUCTURE
+ =================================
+
+The Corinthia repository external/ area is a section of the repository used
+for downloading external dependencies required in constructing Corinthia code.
+These dependencies are required when constructing Corinthia components on and
+for Microsoft Windows.
+
+The downloads are created in an externals/download/ subdirectory. This is
+not part of the repository and is created in a local working copy whenever
+needed. The scripts in externals/ provide the necessary downloading and
+organization of the external material.
+
+The files directly in externals/ level provide documentation and scripts for
+carrying out the download and extraction of material that Corinthia components
+depend on for their compilation and executable operation. These files are
+part of the Corinthia source code repository and are maintained with it.
+
+There are two uses for the externals/ source code,
+
+ 1. as maintained scripts for downloading the current dependencies into
+ the download/ folder in a form that is used by build procedures where
+ these dependencies matter,
+
+ 2. as templates for introducing other download folders that a project
+ may require as part of its capture of external material that is
+ needed on Microsoft Windows.
+
+
+
+ 1. PREREQUISITES FOR USING THE SCRIPTS
+ -----------------------------------
+
+To use these scripts, it is necessary to have an Internet Connection and be
+on a Microsoft Windows platform. Operation can be in a properly-connected
+Virtual Machine guest having an installed Windows Operating System. The
+operating system can be either x86 or x64 based.
+
+The procedures employ Microsoft Windows batch (.bat) files and rely on the
+Windows Scripting Host (WSH) for JScript access to Windows utility functions.
+
+The scripts can be executed using a Windows Shell of the user's choice. They
+have been tested using Windows cmd.exe, Windows PowerShell, MSYS2 (bash),
+CygWin (bash) and JSoft Take Command (formerly 4NT and 4DOS). They have been
+operated on Windows 8.1 Pro and Windows 10 Technical Preview as of January,
+2015.
+
+ 2. OPERATION
+ ---------
+
+In a console session, simply arrange to execute the script
+
+ external/extract_downloads.bat
+
+wherever it is located on the local system. The other script files are used
+as needed to complete the extraction operations.
+
+The external/download/ folder will be created if needed. Any external package
+that is not yet downloaded will be fetched from the Internet. Already-
+downloaded packages will not be downloaded again. (To force a fresh set of
+downloads, simply delete the download/ subfolder.)
+
+The external packages will be stored in external/downloads/ and will remain
+there for any future use so long as that folder is preserved.
+
+If the set of external packages is complete, they will then be expanded into
+download/include/, download/lib/, and download/bin/ subdirectories with the
+files needed for compilation and execution of code that relies on the external
+dependencies.
+
+This extraction is done completely whenever extract_downloads is operated. It
+will not be performed if not all of the package downloads have succeeded.
+
+
+ 3. COMPILE-TIME DEPENDENCY ON THE EXTERNAL/DOWNLOAD CONTENT
+ --------------------------------------------------------
+
+The population of external/downloads/ is presumed in the root CMakeLists.txt
+file in the 'if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")' entry. That
+definition and the current structure here must be kept synchronized.
+
+These externals are for builds targetted to Win32 x86 runtime only. Externals
+needed for producing x64 executables require a different arrangement.
+
+
+ 4. EXTERNAL FILES TO BE INCLUDED WITH CORINTHIA SOFTWARE ON WINDOWS
+ ----------------------------------------------------------------
+
+The external/download/ folder is populated with include/, lib/, and bin/
+subfolders that carry extracted material that Corinthia code depends on when
+compiled for Windows.
+
+The compiled executables will need to be installed in folders that also have
+copies of DLLs from external/download/bin/
+
+ SDL2.dll
+ SDL2_image.dll
+ iconv.dll
+ libjpeg-9.dll
+ libpng16-16.dll
+ libtiff-5.dll
+ libwebp-4.dll
+ libxml2.dll
+ zlib1.dll
+
+The license files in bin/ should be carried along with those DLL files.
+
+Not every Corinthia component requires all of these DLLs. For finer details,
+consult information on the individual component.
+
+
+ 5. MAINTENANCE AND CUSTOMIZATION PROCEDURES
+ ----------------------------------------
+
+ [TBD]
+
+ *** end of README.txt ***
[18/33] incubator-corinthia git commit: dfutil: Fix zip/unzip
parameter order in help text
Posted by ja...@apache.org.
dfutil: Fix zip/unzip parameter order in help text
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/5c9a2c08
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/5c9a2c08
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/5c9a2c08
Branch: refs/heads/experiment64
Commit: 5c9a2c08ea370cf02ea1d76b4a1800ea8076e64b
Parents: d785d58
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Sun Jan 11 10:33:20 2015 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Sun Jan 11 10:33:20 2015 +0700
----------------------------------------------------------------------
consumers/dfutil/src/main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/5c9a2c08/consumers/dfutil/src/main.c
----------------------------------------------------------------------
diff --git a/consumers/dfutil/src/main.c b/consumers/dfutil/src/main.c
index e1bfc7f..fed55ab 100644
--- a/consumers/dfutil/src/main.c
+++ b/consumers/dfutil/src/main.c
@@ -130,10 +130,10 @@ static int runCommand(int argc, const char **argv, DFError **dferr)
"dfutil -css-unescape [infilename]\n"
" Unescape CSS class name\n"
"\n"
- "dfutil -zip sourceDir zipFilename\n"
+ "dfutil -zip zipFilename sourceDir\n"
" Create a zip file\n"
"\n"
- "dfutil -unzip destDir zipFilename\n"
+ "dfutil -unzip zipFilename destDir\n"
" Extract a zip file\n"
"\n"
"dfutil input.html output.docx\n"
[14/33] incubator-corinthia git commit: Shut git up about CRLF issues
Posted by ja...@apache.org.
Shut git up about CRLF issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/db23077f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/db23077f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/db23077f
Branch: refs/heads/experiment64
Commit: db23077f5ecc6cebdf2ab4b2e01242fd6dc5e6bb
Parents: 5204f74
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Sun Jan 11 03:36:23 2015 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Sun Jan 11 03:36:23 2015 +0700
----------------------------------------------------------------------
.../3rdparty/w3c-tidy-html5/build/msvc/tidy.def | 608 +++++++++----------
.../3rdparty/w3c-tidy-html5/build/msvc/tidy.dsp | 188 +++---
.../3rdparty/w3c-tidy-html5/build/msvc/tidy.dsw | 112 ++--
.../w3c-tidy-html5/build/msvc/tidydll.dsp | 592 +++++++++---------
.../w3c-tidy-html5/build/msvc/tidylib.dsp | 590 +++++++++---------
.../w3c-tidy-html5/test/input/cfg_1207443.txt | 4 +-
.../w3c-tidy-html5/test/input/cfg_1210752.txt | 4 +-
.../w3c-tidy-html5/test/input/cfg_1448730.txt | 4 +-
.../w3c-tidy-html5/test/input/cfg_1573338.txt | 12 +-
.../w3c-tidy-html5/test/input/cfg_795643-1.txt | 2 +-
.../w3c-tidy-html5/test/input/cfg_795643-2.txt | 2 +-
.../w3c-tidy-html5/test/input/in_1210752.html | 2 +-
.../w3c-tidy-html5/test/input/in_1263391.html | 58 +-
.../w3c-tidy-html5/test/input/in_1286278.html | 70 +--
.../w3c-tidy-html5/test/input/in_1316258.html | 62 +-
.../w3c-tidy-html5/test/input/in_1316307-2.html | 30 +-
.../w3c-tidy-html5/test/input/in_1316307.html | 62 +-
.../w3c-tidy-html5/test/input/in_1331849.html | 102 ++--
.../w3c-tidy-html5/test/input/in_1333579.html | 18 +-
.../w3c-tidy-html5/test/input/in_1436578.html | 22 +-
.../w3c-tidy-html5/test/input/in_1448730.xml | 10 +-
.../w3c-tidy-html5/test/input/in_1573338.xml | 6 +-
.../w3c-tidy-html5/test/input/in_1715153.html | 24 +-
.../w3c-tidy-html5/test/input/in_2705873-1.html | 26 +-
.../w3c-tidy-html5/test/input/in_2709860.html | 32 +-
.../w3c-tidy-html5/test/input/in_586562.html | 24 +-
.../w3c-tidy-html5/test/input/in_795643-1.html | 2 +-
.../w3c-tidy-html5/test/input/in_795643-2.html | 2 +-
28 files changed, 1335 insertions(+), 1335 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidy.def
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidy.def b/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidy.def
index 4aa732d..317b540 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidy.def
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidy.def
@@ -1,304 +1,304 @@
-LIBRARY libtidy
- EXPORTS
- tidyCreate @1001
- tidyRelease @1002
- tidySetAppData @1003
- tidyGetAppData @1004
- tidyReleaseDate @1005
- tidyStatus @1006
- tidyDetectedHtmlVersion @1007
- tidyDetectedXhtml @1008
- tidyDetectedGenericXml @1009
- tidyErrorCount @1010
- tidyWarningCount @1011
- tidyAccessWarningCount @1012
- tidyConfigErrorCount @1013
- tidyLoadConfig @1014
- tidyLoadConfigEnc @1015
- tidyFileExists @1016
- tidySetCharEncoding @1017
- tidySetInCharEncoding @1018
- tidySetOutCharEncoding @1019
- tidySetOptionCallback @1020
- tidyOptGetIdForName @1021
- tidyGetOptionList @1022
- tidyGetNextOption @1023
- tidyGetOption @1024
- tidyGetOptionByName @1025
- tidyOptGetId @1026
- tidyOptGetName @1027
- tidyOptGetType @1028
- tidyOptIsReadOnly @1029
- tidyOptGetCategory @1030
- tidyOptGetDefault @1031
- tidyOptGetDefaultInt @1032
- tidyOptGetDefaultBool @1033
- tidyOptGetPickList @1034
- tidyOptGetNextPick @1035
- tidyOptGetValue @1036
- tidyOptSetValue @1037
- tidyOptParseValue @1038
- tidyOptGetInt @1039
- tidyOptSetInt @1040
- tidyOptGetBool @1041
- tidyOptSetBool @1042
- tidyOptResetToDefault @1043
- tidyOptResetAllToDefault @1044
- tidyOptSnapshot @1045
- tidyOptResetToSnapshot @1046
- tidyOptDiffThanDefault @1047
- tidyOptDiffThanSnapshot @1048
- tidyOptCopyConfig @1049
- tidyOptGetEncName @1050
- tidyOptGetCurrPick @1051
- tidyOptGetDeclTagList @1052
- tidyOptGetNextDeclTag @1053
- tidyOptGetDoc @1054
- tidyOptGetDocLinksList @1055
- tidyOptGetNextDocLinks @1056
- tidyInitSource @1057
- tidyGetByte @1058
- tidyUngetByte @1059
- tidyIsEOF @1060
- tidyInitSink @1061
- tidyPutByte @1062
- tidySetReportFilter @1063
- tidySetErrorFile @1064
- tidySetErrorBuffer @1065
- tidySetErrorSink @1066
- tidySetMallocCall @1067
- tidySetReallocCall @1068
- tidySetFreeCall @1069
- tidySetPanicCall @1070
- tidyParseFile @1071
- tidyParseStdin @1072
- tidyParseString @1073
- tidyParseBuffer @1074
- tidyParseSource @1075
- tidyCleanAndRepair @1076
- tidyRunDiagnostics @1077
- tidySaveFile @1078
- tidySaveStdout @1079
- tidySaveBuffer @1080
- tidySaveString @1081
- tidySaveSink @1082
- tidyOptSaveFile @1083
- tidyOptSaveSink @1084
- tidyErrorSummary @1085
- tidyGeneralInfo @1086
- tidyGetRoot @1087
- tidyGetHtml @1088
- tidyGetHead @1089
- tidyGetBody @1090
- tidyGetParent @1091
- tidyGetChild @1092
- tidyGetNext @1093
- tidyGetPrev @1094
- tidyAttrFirst @1095
- tidyAttrNext @1096
- tidyAttrName @1097
- tidyAttrValue @1098
- tidyNodeGetType @1099
- tidyNodeGetName @1100
- tidyNodeIsText @1101
- tidyNodeIsProp @1102
- tidyNodeIsHeader @1103
- tidyNodeHasText @1104
- tidyNodeGetText @1105
- tidyNodeGetId @1106
- tidyNodeLine @1107
- tidyNodeColumn @1108
- tidyNodeIsHTML @1109
- tidyNodeIsHEAD @1110
- tidyNodeIsTITLE @1111
- tidyNodeIsBASE @1112
- tidyNodeIsMETA @1113
- tidyNodeIsBODY @1114
- tidyNodeIsFRAMESET @1115
- tidyNodeIsFRAME @1116
- tidyNodeIsIFRAME @1117
- tidyNodeIsNOFRAMES @1118
- tidyNodeIsHR @1119
- tidyNodeIsH1 @1120
- tidyNodeIsH2 @1121
- tidyNodeIsPRE @1122
- tidyNodeIsLISTING @1123
- tidyNodeIsP @1124
- tidyNodeIsUL @1125
- tidyNodeIsOL @1126
- tidyNodeIsDL @1127
- tidyNodeIsDIR @1128
- tidyNodeIsLI @1129
- tidyNodeIsDT @1130
- tidyNodeIsDD @1131
- tidyNodeIsTABLE @1132
- tidyNodeIsCAPTION @1133
- tidyNodeIsTD @1134
- tidyNodeIsTH @1135
- tidyNodeIsTR @1136
- tidyNodeIsCOL @1137
- tidyNodeIsCOLGROUP @1138
- tidyNodeIsBR @1139
- tidyNodeIsA @1140
- tidyNodeIsLINK @1141
- tidyNodeIsB @1142
- tidyNodeIsI @1143
- tidyNodeIsSTRONG @1144
- tidyNodeIsEM @1145
- tidyNodeIsBIG @1146
- tidyNodeIsSMALL @1147
- tidyNodeIsPARAM @1148
- tidyNodeIsOPTION @1149
- tidyNodeIsOPTGROUP @1150
- tidyNodeIsIMG @1151
- tidyNodeIsMAP @1152
- tidyNodeIsAREA @1153
- tidyNodeIsNOBR @1154
- tidyNodeIsWBR @1155
- tidyNodeIsFONT @1156
- tidyNodeIsLAYER @1157
- tidyNodeIsSPACER @1158
- tidyNodeIsCENTER @1159
- tidyNodeIsSTYLE @1160
- tidyNodeIsSCRIPT @1161
- tidyNodeIsNOSCRIPT @1162
- tidyNodeIsFORM @1163
- tidyNodeIsTEXTAREA @1164
- tidyNodeIsBLOCKQUOTE @1165
- tidyNodeIsAPPLET @1166
- tidyNodeIsOBJECT @1167
- tidyNodeIsDIV @1168
- tidyNodeIsSPAN @1169
- tidyNodeIsINPUT @1170
- tidyNodeIsQ @1171
- tidyNodeIsLABEL @1172
- tidyNodeIsH3 @1173
- tidyNodeIsH4 @1174
- tidyNodeIsH5 @1175
- tidyNodeIsH6 @1176
- tidyNodeIsADDRESS @1177
- tidyNodeIsXMP @1178
- tidyNodeIsSELECT @1179
- tidyNodeIsBLINK @1180
- tidyNodeIsMARQUEE @1181
- tidyNodeIsEMBED @1182
- tidyNodeIsBASEFONT @1183
- tidyNodeIsISINDEX @1184
- tidyNodeIsS @1185
- tidyNodeIsSTRIKE @1186
- tidyNodeIsU @1187
- tidyNodeIsMENU @1188
- tidyAttrGetId @1189
- tidyAttrIsEvent @1190
- tidyAttrIsProp @1191
- tidyAttrIsHREF @1192
- tidyAttrIsSRC @1193
- tidyAttrIsID @1194
- tidyAttrIsNAME @1195
- tidyAttrIsSUMMARY @1196
- tidyAttrIsALT @1197
- tidyAttrIsLONGDESC @1198
- tidyAttrIsUSEMAP @1199
- tidyAttrIsISMAP @1200
- tidyAttrIsLANGUAGE @1201
- tidyAttrIsTYPE @1202
- tidyAttrIsVALUE @1203
- tidyAttrIsCONTENT @1204
- tidyAttrIsTITLE @1205
- tidyAttrIsXMLNS @1206
- tidyAttrIsDATAFLD @1207
- tidyAttrIsWIDTH @1208
- tidyAttrIsHEIGHT @1209
- tidyAttrIsFOR @1210
- tidyAttrIsSELECTED @1211
- tidyAttrIsCHECKED @1212
- tidyAttrIsLANG @1213
- tidyAttrIsTARGET @1214
- tidyAttrIsHTTP_EQUIV @1215
- tidyAttrIsREL @1216
- tidyAttrIsOnMOUSEMOVE @1217
- tidyAttrIsOnMOUSEDOWN @1218
- tidyAttrIsOnMOUSEUP @1219
- tidyAttrIsOnCLICK @1220
- tidyAttrIsOnMOUSEOVER @1221
- tidyAttrIsOnMOUSEOUT @1222
- tidyAttrIsOnKEYDOWN @1223
- tidyAttrIsOnKEYUP @1224
- tidyAttrIsOnKEYPRESS @1225
- tidyAttrIsOnFOCUS @1226
- tidyAttrIsOnBLUR @1227
- tidyAttrIsBGCOLOR @1228
- tidyAttrIsLINK @1229
- tidyAttrIsALINK @1230
- tidyAttrIsVLINK @1231
- tidyAttrIsTEXT @1232
- tidyAttrIsSTYLE @1233
- tidyAttrIsABBR @1234
- tidyAttrIsCOLSPAN @1235
- tidyAttrIsROWSPAN @1236
- tidyAttrGetById @1237
- tidyAttrGetHREF @1238
- tidyAttrGetSRC @1239
- tidyAttrGetID @1240
- tidyAttrGetNAME @1241
- tidyAttrGetSUMMARY @1242
- tidyAttrGetALT @1243
- tidyAttrGetLONGDESC @1244
- tidyAttrGetUSEMAP @1245
- tidyAttrGetISMAP @1246
- tidyAttrGetLANGUAGE @1247
- tidyAttrGetTYPE @1248
- tidyAttrGetVALUE @1249
- tidyAttrGetCONTENT @1250
- tidyAttrGetTITLE @1251
- tidyAttrGetXMLNS @1252
- tidyAttrGetDATAFLD @1253
- tidyAttrGetWIDTH @1254
- tidyAttrGetHEIGHT @1255
- tidyAttrGetFOR @1256
- tidyAttrGetSELECTED @1257
- tidyAttrGetCHECKED @1258
- tidyAttrGetLANG @1259
- tidyAttrGetTARGET @1260
- tidyAttrGetHTTP_EQUIV @1261
- tidyAttrGetREL @1262
- tidyAttrGetOnMOUSEMOVE @1263
- tidyAttrGetOnMOUSEDOWN @1264
- tidyAttrGetOnMOUSEUP @1265
- tidyAttrGetOnCLICK @1266
- tidyAttrGetOnMOUSEOVER @1267
- tidyAttrGetOnMOUSEOUT @1268
- tidyAttrGetOnKEYDOWN @1269
- tidyAttrGetOnKEYUP @1270
- tidyAttrGetOnKEYPRESS @1271
- tidyAttrGetOnFOCUS @1272
- tidyAttrGetOnBLUR @1273
- tidyAttrGetBGCOLOR @1274
- tidyAttrGetLINK @1275
- tidyAttrGetALINK @1276
- tidyAttrGetVLINK @1277
- tidyAttrGetTEXT @1278
- tidyAttrGetSTYLE @1279
- tidyAttrGetABBR @1280
- tidyAttrGetCOLSPAN @1281
- tidyAttrGetROWSPAN @1282
- tidyCreateWithAllocator @1283
-
- tidyInitInputBuffer @2001
- tidyInitOutputBuffer @2002
- tidyBufInit @2003
- tidyBufAlloc @2004
- tidyBufCheckAlloc @2005
- tidyBufFree @2006
- tidyBufClear @2007
- tidyBufAttach @2008
- tidyBufDetach @2009
- tidyBufAppend @2010
- tidyBufPutByte @2011
- tidyBufPopByte @2012
- tidyBufGetByte @2013
- tidyBufEndOfInput @2014
- tidyBufUngetByte @2015
- tidyBufInitWithAllocator @2016
- tidyBufAllocWithAllocator @2017
- tidyNodeGetValue @2018
+LIBRARY libtidy
+ EXPORTS
+ tidyCreate @1001
+ tidyRelease @1002
+ tidySetAppData @1003
+ tidyGetAppData @1004
+ tidyReleaseDate @1005
+ tidyStatus @1006
+ tidyDetectedHtmlVersion @1007
+ tidyDetectedXhtml @1008
+ tidyDetectedGenericXml @1009
+ tidyErrorCount @1010
+ tidyWarningCount @1011
+ tidyAccessWarningCount @1012
+ tidyConfigErrorCount @1013
+ tidyLoadConfig @1014
+ tidyLoadConfigEnc @1015
+ tidyFileExists @1016
+ tidySetCharEncoding @1017
+ tidySetInCharEncoding @1018
+ tidySetOutCharEncoding @1019
+ tidySetOptionCallback @1020
+ tidyOptGetIdForName @1021
+ tidyGetOptionList @1022
+ tidyGetNextOption @1023
+ tidyGetOption @1024
+ tidyGetOptionByName @1025
+ tidyOptGetId @1026
+ tidyOptGetName @1027
+ tidyOptGetType @1028
+ tidyOptIsReadOnly @1029
+ tidyOptGetCategory @1030
+ tidyOptGetDefault @1031
+ tidyOptGetDefaultInt @1032
+ tidyOptGetDefaultBool @1033
+ tidyOptGetPickList @1034
+ tidyOptGetNextPick @1035
+ tidyOptGetValue @1036
+ tidyOptSetValue @1037
+ tidyOptParseValue @1038
+ tidyOptGetInt @1039
+ tidyOptSetInt @1040
+ tidyOptGetBool @1041
+ tidyOptSetBool @1042
+ tidyOptResetToDefault @1043
+ tidyOptResetAllToDefault @1044
+ tidyOptSnapshot @1045
+ tidyOptResetToSnapshot @1046
+ tidyOptDiffThanDefault @1047
+ tidyOptDiffThanSnapshot @1048
+ tidyOptCopyConfig @1049
+ tidyOptGetEncName @1050
+ tidyOptGetCurrPick @1051
+ tidyOptGetDeclTagList @1052
+ tidyOptGetNextDeclTag @1053
+ tidyOptGetDoc @1054
+ tidyOptGetDocLinksList @1055
+ tidyOptGetNextDocLinks @1056
+ tidyInitSource @1057
+ tidyGetByte @1058
+ tidyUngetByte @1059
+ tidyIsEOF @1060
+ tidyInitSink @1061
+ tidyPutByte @1062
+ tidySetReportFilter @1063
+ tidySetErrorFile @1064
+ tidySetErrorBuffer @1065
+ tidySetErrorSink @1066
+ tidySetMallocCall @1067
+ tidySetReallocCall @1068
+ tidySetFreeCall @1069
+ tidySetPanicCall @1070
+ tidyParseFile @1071
+ tidyParseStdin @1072
+ tidyParseString @1073
+ tidyParseBuffer @1074
+ tidyParseSource @1075
+ tidyCleanAndRepair @1076
+ tidyRunDiagnostics @1077
+ tidySaveFile @1078
+ tidySaveStdout @1079
+ tidySaveBuffer @1080
+ tidySaveString @1081
+ tidySaveSink @1082
+ tidyOptSaveFile @1083
+ tidyOptSaveSink @1084
+ tidyErrorSummary @1085
+ tidyGeneralInfo @1086
+ tidyGetRoot @1087
+ tidyGetHtml @1088
+ tidyGetHead @1089
+ tidyGetBody @1090
+ tidyGetParent @1091
+ tidyGetChild @1092
+ tidyGetNext @1093
+ tidyGetPrev @1094
+ tidyAttrFirst @1095
+ tidyAttrNext @1096
+ tidyAttrName @1097
+ tidyAttrValue @1098
+ tidyNodeGetType @1099
+ tidyNodeGetName @1100
+ tidyNodeIsText @1101
+ tidyNodeIsProp @1102
+ tidyNodeIsHeader @1103
+ tidyNodeHasText @1104
+ tidyNodeGetText @1105
+ tidyNodeGetId @1106
+ tidyNodeLine @1107
+ tidyNodeColumn @1108
+ tidyNodeIsHTML @1109
+ tidyNodeIsHEAD @1110
+ tidyNodeIsTITLE @1111
+ tidyNodeIsBASE @1112
+ tidyNodeIsMETA @1113
+ tidyNodeIsBODY @1114
+ tidyNodeIsFRAMESET @1115
+ tidyNodeIsFRAME @1116
+ tidyNodeIsIFRAME @1117
+ tidyNodeIsNOFRAMES @1118
+ tidyNodeIsHR @1119
+ tidyNodeIsH1 @1120
+ tidyNodeIsH2 @1121
+ tidyNodeIsPRE @1122
+ tidyNodeIsLISTING @1123
+ tidyNodeIsP @1124
+ tidyNodeIsUL @1125
+ tidyNodeIsOL @1126
+ tidyNodeIsDL @1127
+ tidyNodeIsDIR @1128
+ tidyNodeIsLI @1129
+ tidyNodeIsDT @1130
+ tidyNodeIsDD @1131
+ tidyNodeIsTABLE @1132
+ tidyNodeIsCAPTION @1133
+ tidyNodeIsTD @1134
+ tidyNodeIsTH @1135
+ tidyNodeIsTR @1136
+ tidyNodeIsCOL @1137
+ tidyNodeIsCOLGROUP @1138
+ tidyNodeIsBR @1139
+ tidyNodeIsA @1140
+ tidyNodeIsLINK @1141
+ tidyNodeIsB @1142
+ tidyNodeIsI @1143
+ tidyNodeIsSTRONG @1144
+ tidyNodeIsEM @1145
+ tidyNodeIsBIG @1146
+ tidyNodeIsSMALL @1147
+ tidyNodeIsPARAM @1148
+ tidyNodeIsOPTION @1149
+ tidyNodeIsOPTGROUP @1150
+ tidyNodeIsIMG @1151
+ tidyNodeIsMAP @1152
+ tidyNodeIsAREA @1153
+ tidyNodeIsNOBR @1154
+ tidyNodeIsWBR @1155
+ tidyNodeIsFONT @1156
+ tidyNodeIsLAYER @1157
+ tidyNodeIsSPACER @1158
+ tidyNodeIsCENTER @1159
+ tidyNodeIsSTYLE @1160
+ tidyNodeIsSCRIPT @1161
+ tidyNodeIsNOSCRIPT @1162
+ tidyNodeIsFORM @1163
+ tidyNodeIsTEXTAREA @1164
+ tidyNodeIsBLOCKQUOTE @1165
+ tidyNodeIsAPPLET @1166
+ tidyNodeIsOBJECT @1167
+ tidyNodeIsDIV @1168
+ tidyNodeIsSPAN @1169
+ tidyNodeIsINPUT @1170
+ tidyNodeIsQ @1171
+ tidyNodeIsLABEL @1172
+ tidyNodeIsH3 @1173
+ tidyNodeIsH4 @1174
+ tidyNodeIsH5 @1175
+ tidyNodeIsH6 @1176
+ tidyNodeIsADDRESS @1177
+ tidyNodeIsXMP @1178
+ tidyNodeIsSELECT @1179
+ tidyNodeIsBLINK @1180
+ tidyNodeIsMARQUEE @1181
+ tidyNodeIsEMBED @1182
+ tidyNodeIsBASEFONT @1183
+ tidyNodeIsISINDEX @1184
+ tidyNodeIsS @1185
+ tidyNodeIsSTRIKE @1186
+ tidyNodeIsU @1187
+ tidyNodeIsMENU @1188
+ tidyAttrGetId @1189
+ tidyAttrIsEvent @1190
+ tidyAttrIsProp @1191
+ tidyAttrIsHREF @1192
+ tidyAttrIsSRC @1193
+ tidyAttrIsID @1194
+ tidyAttrIsNAME @1195
+ tidyAttrIsSUMMARY @1196
+ tidyAttrIsALT @1197
+ tidyAttrIsLONGDESC @1198
+ tidyAttrIsUSEMAP @1199
+ tidyAttrIsISMAP @1200
+ tidyAttrIsLANGUAGE @1201
+ tidyAttrIsTYPE @1202
+ tidyAttrIsVALUE @1203
+ tidyAttrIsCONTENT @1204
+ tidyAttrIsTITLE @1205
+ tidyAttrIsXMLNS @1206
+ tidyAttrIsDATAFLD @1207
+ tidyAttrIsWIDTH @1208
+ tidyAttrIsHEIGHT @1209
+ tidyAttrIsFOR @1210
+ tidyAttrIsSELECTED @1211
+ tidyAttrIsCHECKED @1212
+ tidyAttrIsLANG @1213
+ tidyAttrIsTARGET @1214
+ tidyAttrIsHTTP_EQUIV @1215
+ tidyAttrIsREL @1216
+ tidyAttrIsOnMOUSEMOVE @1217
+ tidyAttrIsOnMOUSEDOWN @1218
+ tidyAttrIsOnMOUSEUP @1219
+ tidyAttrIsOnCLICK @1220
+ tidyAttrIsOnMOUSEOVER @1221
+ tidyAttrIsOnMOUSEOUT @1222
+ tidyAttrIsOnKEYDOWN @1223
+ tidyAttrIsOnKEYUP @1224
+ tidyAttrIsOnKEYPRESS @1225
+ tidyAttrIsOnFOCUS @1226
+ tidyAttrIsOnBLUR @1227
+ tidyAttrIsBGCOLOR @1228
+ tidyAttrIsLINK @1229
+ tidyAttrIsALINK @1230
+ tidyAttrIsVLINK @1231
+ tidyAttrIsTEXT @1232
+ tidyAttrIsSTYLE @1233
+ tidyAttrIsABBR @1234
+ tidyAttrIsCOLSPAN @1235
+ tidyAttrIsROWSPAN @1236
+ tidyAttrGetById @1237
+ tidyAttrGetHREF @1238
+ tidyAttrGetSRC @1239
+ tidyAttrGetID @1240
+ tidyAttrGetNAME @1241
+ tidyAttrGetSUMMARY @1242
+ tidyAttrGetALT @1243
+ tidyAttrGetLONGDESC @1244
+ tidyAttrGetUSEMAP @1245
+ tidyAttrGetISMAP @1246
+ tidyAttrGetLANGUAGE @1247
+ tidyAttrGetTYPE @1248
+ tidyAttrGetVALUE @1249
+ tidyAttrGetCONTENT @1250
+ tidyAttrGetTITLE @1251
+ tidyAttrGetXMLNS @1252
+ tidyAttrGetDATAFLD @1253
+ tidyAttrGetWIDTH @1254
+ tidyAttrGetHEIGHT @1255
+ tidyAttrGetFOR @1256
+ tidyAttrGetSELECTED @1257
+ tidyAttrGetCHECKED @1258
+ tidyAttrGetLANG @1259
+ tidyAttrGetTARGET @1260
+ tidyAttrGetHTTP_EQUIV @1261
+ tidyAttrGetREL @1262
+ tidyAttrGetOnMOUSEMOVE @1263
+ tidyAttrGetOnMOUSEDOWN @1264
+ tidyAttrGetOnMOUSEUP @1265
+ tidyAttrGetOnCLICK @1266
+ tidyAttrGetOnMOUSEOVER @1267
+ tidyAttrGetOnMOUSEOUT @1268
+ tidyAttrGetOnKEYDOWN @1269
+ tidyAttrGetOnKEYUP @1270
+ tidyAttrGetOnKEYPRESS @1271
+ tidyAttrGetOnFOCUS @1272
+ tidyAttrGetOnBLUR @1273
+ tidyAttrGetBGCOLOR @1274
+ tidyAttrGetLINK @1275
+ tidyAttrGetALINK @1276
+ tidyAttrGetVLINK @1277
+ tidyAttrGetTEXT @1278
+ tidyAttrGetSTYLE @1279
+ tidyAttrGetABBR @1280
+ tidyAttrGetCOLSPAN @1281
+ tidyAttrGetROWSPAN @1282
+ tidyCreateWithAllocator @1283
+
+ tidyInitInputBuffer @2001
+ tidyInitOutputBuffer @2002
+ tidyBufInit @2003
+ tidyBufAlloc @2004
+ tidyBufCheckAlloc @2005
+ tidyBufFree @2006
+ tidyBufClear @2007
+ tidyBufAttach @2008
+ tidyBufDetach @2009
+ tidyBufAppend @2010
+ tidyBufPutByte @2011
+ tidyBufPopByte @2012
+ tidyBufGetByte @2013
+ tidyBufEndOfInput @2014
+ tidyBufUngetByte @2015
+ tidyBufInitWithAllocator @2016
+ tidyBufAllocWithAllocator @2017
+ tidyNodeGetValue @2018
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidy.dsp
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidy.dsp b/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidy.dsp
index f405688..e95adde 100644
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidy.dsp
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidy.dsp
@@ -1,94 +1,94 @@
-# Microsoft Developer Studio Project File - Name="tidy" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=tidy - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "tidy.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "tidy.mak" CFG="tidy - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "tidy - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "tidy - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "tidy - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /Za /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D SUPPORT_UTF16_ENCODINGS=1 /D SUPPORT_ASIAN_ENCODINGS=1 /D SUPPORT_ACCESSIBILITY_CHECKS=1 /D TIDYDLL_EXPORT=__declspec(dllimport) /D _CRT_SECURE_NO_DEPRECATE /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /profile /map /machine:I386
-
-!ELSEIF "$(CFG)" == "tidy - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /Za /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D SUPPORT_UTF16_ENCODINGS=1 /D SUPPORT_ASIAN_ENCODINGS=1 /D SUPPORT_ACCESSIBILITY_CHECKS=1 /D TIDYDLL_EXPORT=__declspec(dllimport) /D _CRT_SECURE_NO_DEPRECATE /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "tidy - Win32 Release"
-# Name "tidy - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\console\tidy.c
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="tidy" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=tidy - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "tidy.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "tidy.mak" CFG="tidy - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "tidy - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "tidy - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "tidy - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /Za /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D SUPPORT_UTF16_ENCODINGS=1 /D SUPPORT_ASIAN_ENCODINGS=1 /D SUPPORT_ACCESSIBILITY_CHECKS=1 /D TIDYDLL_EXPORT=__declspec(dllimport) /D _CRT_SECURE_NO_DEPRECATE /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /profile /map /machine:I386
+
+!ELSEIF "$(CFG)" == "tidy - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /Za /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D SUPPORT_UTF16_ENCODINGS=1 /D SUPPORT_ASIAN_ENCODINGS=1 /D SUPPORT_ACCESSIBILITY_CHECKS=1 /D TIDYDLL_EXPORT=__declspec(dllimport) /D _CRT_SECURE_NO_DEPRECATE /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "tidy - Win32 Release"
+# Name "tidy - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\console\tidy.c
+# End Source File
+# End Group
+# End Target
+# End Project
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidy.dsw
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidy.dsw b/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidy.dsw
index 0567970..e967fe0 100644
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidy.dsw
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidy.dsw
@@ -1,56 +1,56 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "tidy"=.\tidy.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name tidylib
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "tidydll"=.\tidydll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "tidylib"=.\tidylib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "tidy"=.\tidy.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name tidylib
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "tidydll"=.\tidydll.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "tidylib"=.\tidylib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidydll.dsp
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidydll.dsp b/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidydll.dsp
index 41548ea..129c6de 100644
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidydll.dsp
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidydll.dsp
@@ -1,296 +1,296 @@
-# Microsoft Developer Studio Project File - Name="tidydll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=tidydll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "tidydll.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "tidydll.mak" CFG="tidydll - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "tidydll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "tidydll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "tidydll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "tidydll___Win32_Release"
-# PROP BASE Intermediate_Dir "tidydll___Win32_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseDLL"
-# PROP Intermediate_Dir "ReleaseDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TIDYDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TIDYDLL_EXPORTS" /D SUPPORT_UTF16_ENCODINGS=1 /D SUPPORT_ASIAN_ENCODINGS=1 /D SUPPORT_ACCESSIBILITY_CHECKS=1 /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"ReleaseDLL/libtidy.dll"
-
-!ELSEIF "$(CFG)" == "tidydll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "tidydll___Win32_Debug"
-# PROP BASE Intermediate_Dir "tidydll___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugDLL"
-# PROP Intermediate_Dir "DebugDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TIDYDLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D SUPPORT_UTF16_ENCODINGS=1 /D SUPPORT_ASIAN_ENCODINGS=1 /D SUPPORT_ACCESSIBILITY_CHECKS=1 /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"DebugDLL/libtidy.dll" /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "tidydll - Win32 Release"
-# Name "tidydll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\src\access.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\alloc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\attrask.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\attrdict.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\attrget.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\attrs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\buffio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\clean.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\config.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\entities.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\fileio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\istack.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lexer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\localize.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mappedio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\parser.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\pprint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\streamio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\tagask.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tidy.def
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\tags.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\tidylib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\tmbstr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utf8.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\win32tc.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\src\access.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\attrdict.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\attrs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\buffio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\clean.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\entities.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\fileio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\forward.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lexer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mappedio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\message.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\parser.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\platform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\pprint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\streamio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\tags.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\src\tidy-int.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\tidy.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\tidyenum.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\tmbstr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utf8.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\version.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\win32tc.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="tidydll" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=tidydll - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "tidydll.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "tidydll.mak" CFG="tidydll - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "tidydll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "tidydll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "tidydll - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "tidydll___Win32_Release"
+# PROP BASE Intermediate_Dir "tidydll___Win32_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ReleaseDLL"
+# PROP Intermediate_Dir "ReleaseDLL"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TIDYDLL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TIDYDLL_EXPORTS" /D SUPPORT_UTF16_ENCODINGS=1 /D SUPPORT_ASIAN_ENCODINGS=1 /D SUPPORT_ACCESSIBILITY_CHECKS=1 /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"ReleaseDLL/libtidy.dll"
+
+!ELSEIF "$(CFG)" == "tidydll - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "tidydll___Win32_Debug"
+# PROP BASE Intermediate_Dir "tidydll___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "DebugDLL"
+# PROP Intermediate_Dir "DebugDLL"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TIDYDLL_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D SUPPORT_UTF16_ENCODINGS=1 /D SUPPORT_ASIAN_ENCODINGS=1 /D SUPPORT_ACCESSIBILITY_CHECKS=1 /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"DebugDLL/libtidy.dll" /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "tidydll - Win32 Release"
+# Name "tidydll - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\src\access.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\alloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\attrask.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\attrdict.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\attrget.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\attrs.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\buffio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\clean.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\config.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\entities.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fileio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\istack.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\lexer.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\localize.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\mappedio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\parser.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\pprint.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\streamio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\tagask.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tidy.def
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\tags.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\tidylib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\tmbstr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\utf8.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\win32tc.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\src\access.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\attrdict.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\attrs.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\buffio.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\clean.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\entities.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fileio.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\forward.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\lexer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\mappedio.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\message.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\parser.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\platform.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\pprint.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\streamio.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\tags.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\src\tidy-int.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\tidy.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\tidyenum.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\tmbstr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\utf8.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\version.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\win32tc.h
+# End Source File
+# End Group
+# End Target
+# End Project
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidylib.dsp
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidylib.dsp b/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidylib.dsp
index 3e9dd65..d5a233c 100644
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidylib.dsp
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/build/msvc/tidylib.dsp
@@ -1,295 +1,295 @@
-# Microsoft Developer Studio Project File - Name="tidylib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=tidylib - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "tidylib.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "tidylib.mak" CFG="tidylib - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "tidylib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "tidylib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "tidylib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W4 /GX /O2 /I "../../include" /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "SUPPORT_UTF16_ENCODINGS" /D "SUPPORT_ASIAN_ENCODINGS" /D "SUPPORT_ACCESSIBILITY_CHECKS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Release\libtidy.lib"
-
-!ELSEIF "$(CFG)" == "tidylib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /Za /W4 /Gm /ZI /Od /I "../../include" /D "_DEBUG" /D "_WIN32" /D "_LIB" /D "WIN32" /D "_MBCS" /D "SUPPORT_UTF16_ENCODINGS" /D "SUPPORT_ASIAN_ENCODINGS" /D "SUPPORT_ACCESSIBILITY_CHECKS" /U "WINDOWS" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Debug\libtidy.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "tidylib - Win32 Release"
-# Name "tidylib - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\src\access.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\alloc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\attrask.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\attrdict.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\attrget.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\attrs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\buffio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\clean.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\config.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\entities.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\fileio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\istack.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lexer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\localize.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mappedio.c
-
-!IF "$(CFG)" == "tidylib - Win32 Release"
-
-!ELSEIF "$(CFG)" == "tidylib - Win32 Debug"
-
-# ADD CPP /Ze
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\parser.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\pprint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\streamio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\tagask.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\tags.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\tidylib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\tmbstr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utf8.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\win32tc.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\src\access.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\attrdict.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\attrs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\buffio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\clean.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\entities.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\fileio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\forward.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lexer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mappedio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\message.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\parser.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\platform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\pprint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\streamio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\tags.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\src\tidy-int.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\tidy.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\tidyenum.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\tmbstr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\utf8.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\version.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\win32tc.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="tidylib" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=tidylib - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "tidylib.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "tidylib.mak" CFG="tidylib - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "tidylib - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "tidylib - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "tidylib - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W4 /GX /O2 /I "../../include" /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "SUPPORT_UTF16_ENCODINGS" /D "SUPPORT_ASIAN_ENCODINGS" /D "SUPPORT_ACCESSIBILITY_CHECKS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"Release\libtidy.lib"
+
+!ELSEIF "$(CFG)" == "tidylib - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /Za /W4 /Gm /ZI /Od /I "../../include" /D "_DEBUG" /D "_WIN32" /D "_LIB" /D "WIN32" /D "_MBCS" /D "SUPPORT_UTF16_ENCODINGS" /D "SUPPORT_ASIAN_ENCODINGS" /D "SUPPORT_ACCESSIBILITY_CHECKS" /U "WINDOWS" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"Debug\libtidy.lib"
+
+!ENDIF
+
+# Begin Target
+
+# Name "tidylib - Win32 Release"
+# Name "tidylib - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\src\access.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\alloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\attrask.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\attrdict.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\attrget.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\attrs.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\buffio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\clean.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\config.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\entities.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fileio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\istack.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\lexer.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\localize.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\mappedio.c
+
+!IF "$(CFG)" == "tidylib - Win32 Release"
+
+!ELSEIF "$(CFG)" == "tidylib - Win32 Debug"
+
+# ADD CPP /Ze
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\parser.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\pprint.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\streamio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\tagask.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\tags.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\tidylib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\tmbstr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\utf8.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\win32tc.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\src\access.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\attrdict.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\attrs.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\buffio.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\clean.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\entities.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fileio.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\forward.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\lexer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\mappedio.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\message.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\parser.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\platform.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\pprint.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\streamio.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\tags.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\src\tidy-int.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\tidy.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\tidyenum.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\tmbstr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\utf8.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\version.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\win32tc.h
+# End Source File
+# End Group
+# End Target
+# End Project
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_1207443.txt
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_1207443.txt b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_1207443.txt
index 1662fde..17e8359 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_1207443.txt
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_1207443.txt
@@ -1,2 +1,2 @@
-output-xhtml: yes
-tidy-mark: no
+output-xhtml: yes
+tidy-mark: no
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_1210752.txt
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_1210752.txt b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_1210752.txt
index dd8cc71..09ac84c 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_1210752.txt
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_1210752.txt
@@ -1,2 +1,2 @@
-output-encoding: raw
-output-xhtml: yes
+output-encoding: raw
+output-xhtml: yes
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_1448730.txt
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_1448730.txt b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_1448730.txt
index b9f36a2..20a27f0 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_1448730.txt
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_1448730.txt
@@ -1,2 +1,2 @@
-input-xml: yes
-output-xml: yes
+input-xml: yes
+output-xml: yes
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_1573338.txt
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_1573338.txt b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_1573338.txt
index 6e95305..3fd658e 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_1573338.txt
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_1573338.txt
@@ -1,6 +1,6 @@
-input-xml: yes
-output-xml: yes
-indent: auto
-literal-attributes: yes
-indent-attributes: yes
-wrap: 78
+input-xml: yes
+output-xml: yes
+indent: auto
+literal-attributes: yes
+indent-attributes: yes
+wrap: 78
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_795643-1.txt
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_795643-1.txt b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_795643-1.txt
index e50dcf4..7212423 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_795643-1.txt
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_795643-1.txt
@@ -1 +1 @@
-show-body-only: auto
+show-body-only: auto
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_795643-2.txt
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_795643-2.txt b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_795643-2.txt
index e50dcf4..7212423 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_795643-2.txt
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/cfg_795643-2.txt
@@ -1 +1 @@
-show-body-only: auto
+show-body-only: auto
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1210752.html
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1210752.html b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1210752.html
index 380c4c1..a8aed04 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1210752.html
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1210752.html
@@ -1 +1 @@
-<p>
+<p>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1263391.html
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1263391.html b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1263391.html
index 450d6c5..f0f2048 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1263391.html
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1263391.html
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
- <head>
- <title>My page</title>
- </head>
- <body id="cv">
- This should return 2 HTML errors. But there is none<br/>
- DIV or UL are not allowed in address<br/>
- <address id="contact_postal">
- <div id="identite">toto titi</div>
- <div id="adresse">
- 1st street<br />
- 23X52 - NY <br />
- </div>
- </address>
- <hr />
- <address id="contact_autre">
- <ul id="contact_tel">
- <li id="portable">...</li>
- <li id="fixe">...</li>
- </ul>
- </address>
- <hr />
- <p>p is allowed within address only in html transitional.</p>
- <address id="contact_autre">
- <p><a id="adresse_mail" href="/path/to/contact/page">contact name</a></p>
- </address>
-</body>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
+ <head>
+ <title>My page</title>
+ </head>
+ <body id="cv">
+ This should return 2 HTML errors. But there is none<br/>
+ DIV or UL are not allowed in address<br/>
+ <address id="contact_postal">
+ <div id="identite">toto titi</div>
+ <div id="adresse">
+ 1st street<br />
+ 23X52 - NY <br />
+ </div>
+ </address>
+ <hr />
+ <address id="contact_autre">
+ <ul id="contact_tel">
+ <li id="portable">...</li>
+ <li id="fixe">...</li>
+ </ul>
+ </address>
+ <hr />
+ <p>p is allowed within address only in html transitional.</p>
+ <address id="contact_autre">
+ <p><a id="adresse_mail" href="/path/to/contact/page">contact name</a></p>
+ </address>
+</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1286278.html
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1286278.html b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1286278.html
index 81695d6..45a04cd 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1286278.html
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1286278.html
@@ -1,35 +1,35 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>1286278</title>
-</head>
-<body>
-
-<div>
-hello
-<p></p>
-hello
-<p></p>
-<p></p>
-hello
-<p></p>
-<p></p>
-<p></p>
-hello
-</div>
-
-<hr>
-
-<div>
-hello
-<p></p>
-hello
-<p></p>
-hello
-<p></p>
-hello
-</div>
-
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title>1286278</title>
+</head>
+<body>
+
+<div>
+hello
+<p></p>
+hello
+<p></p>
+<p></p>
+hello
+<p></p>
+<p></p>
+<p></p>
+hello
+</div>
+
+<hr>
+
+<div>
+hello
+<p></p>
+hello
+<p></p>
+hello
+<p></p>
+hello
+</div>
+
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1316258.html
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1316258.html b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1316258.html
index 0fd5407..4088447 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1316258.html
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1316258.html
@@ -1,31 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><title>1316258</title></HEAD>
-<BODY>
-<P>
- This is text that should appear BEFORE the table.
-</P>
-<CENTER>
-<TABLE CELLSPACING="0" BORDER="1" CELLPADDING="2" WIDTH="662" summary="">
- <TR>
- <TD>Row 1 - Col 1</TD>
-</CENTER>
- <TD>Row 1 - Col 2</TD>
- <TD>Row 1 - Col 3</TD>
- <TD>Row 1 - Col 4</TD>
- <TD>Row 1 - Col 5</TD>
- </TR>
- <TR>
- <TD>Row 2 - Col 1</TD>
- <TD>Row 2 - Col 2</TD>
- <TD>Row 2 - Col 3</TD>
- <TD>Row 2 - Col 4</TD>
- <TD>Row 2 - Col 5</TD>
- </TR>
-</TABLE>
-</CENTER>
-<P>
- This is text that should appear AFTER the table.
-</P>
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD><title>1316258</title></HEAD>
+<BODY>
+<P>
+ This is text that should appear BEFORE the table.
+</P>
+<CENTER>
+<TABLE CELLSPACING="0" BORDER="1" CELLPADDING="2" WIDTH="662" summary="">
+ <TR>
+ <TD>Row 1 - Col 1</TD>
+</CENTER>
+ <TD>Row 1 - Col 2</TD>
+ <TD>Row 1 - Col 3</TD>
+ <TD>Row 1 - Col 4</TD>
+ <TD>Row 1 - Col 5</TD>
+ </TR>
+ <TR>
+ <TD>Row 2 - Col 1</TD>
+ <TD>Row 2 - Col 2</TD>
+ <TD>Row 2 - Col 3</TD>
+ <TD>Row 2 - Col 4</TD>
+ <TD>Row 2 - Col 5</TD>
+ </TR>
+</TABLE>
+</CENTER>
+<P>
+ This is text that should appear AFTER the table.
+</P>
+</BODY>
+</HTML>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1316307-2.html
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1316307-2.html b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1316307-2.html
index 57f81bd..dfb6b9b 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1316307-2.html
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1316307-2.html
@@ -1,15 +1,15 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head><title>1316307-2</title></head>
-<body>
-<table>
-<tr>
-<ul>
-<td>
-Cell Data
-</td>
-</ul>
-</tr>
-</table>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head><title>1316307-2</title></head>
+<body>
+<table>
+<tr>
+<ul>
+<td>
+Cell Data
+</td>
+</ul>
+</tr>
+</table>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1316307.html
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1316307.html b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1316307.html
index 494410d..1f2e227 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1316307.html
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1316307.html
@@ -1,31 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><TITLE>1316307</TITLE></HEAD>
-<BODY>
-<P>
- This is text that should appear BEFORE the table.
-</P>
-<CENTER>
-<TABLE CELLSPACING=0 BORDER=1 CELLPADDING=2 WIDTH=662 SUMMARY="">
- <TR>
- <TD>Row 1 - Col 1</TD>
- <TD>Row 1 - Col 2</TD>
-<CENTER>
- <TD>Row 1 - Col 3</TD>
- <TD>Row 1 - Col 4</TD>
- <TD>Row 1 - Col 5</TD>
- </TR>
- <TR>
- <TD>Row 2 - Col 1</TD>
- <TD>Row 2 - Col 2</TD>
- <TD>Row 2 - Col 3</TD>
- <TD>Row 2 - Col 4</TD>
- <TD>Row 2 - Col 5</TD>
- </TR>
-</TABLE>
-</CENTER>
-<P>
- This is text that should appear AFTER the table. HTML Tidy output however shows it BEFORE the table.
-</P>
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD><TITLE>1316307</TITLE></HEAD>
+<BODY>
+<P>
+ This is text that should appear BEFORE the table.
+</P>
+<CENTER>
+<TABLE CELLSPACING=0 BORDER=1 CELLPADDING=2 WIDTH=662 SUMMARY="">
+ <TR>
+ <TD>Row 1 - Col 1</TD>
+ <TD>Row 1 - Col 2</TD>
+<CENTER>
+ <TD>Row 1 - Col 3</TD>
+ <TD>Row 1 - Col 4</TD>
+ <TD>Row 1 - Col 5</TD>
+ </TR>
+ <TR>
+ <TD>Row 2 - Col 1</TD>
+ <TD>Row 2 - Col 2</TD>
+ <TD>Row 2 - Col 3</TD>
+ <TD>Row 2 - Col 4</TD>
+ <TD>Row 2 - Col 5</TD>
+ </TR>
+</TABLE>
+</CENTER>
+<P>
+ This is text that should appear AFTER the table. HTML Tidy output however shows it BEFORE the table.
+</P>
+</BODY>
+</HTML>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1331849.html
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1331849.html b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1331849.html
index b3787f1..e183fdb 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1331849.html
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1331849.html
@@ -1,51 +1,51 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>1331849</TITLE>
-</HEAD>
-<BODY>
-Text BEFORE [implied] table
-
-<TR>
-<TD>
-Implied table cell.
-</TD>
-<TD>
-Implied because there is no opening table tag - just an opening table row tag.
-</TD>
-</TR>
-<TR>
-<TD WIDTH="2%" VALIGN="TOP">
-2nd Row of implied table
-</TD>
-<TD>
-More text
-</TD>
-</TR>
-</table>
-
-Text AFTER [implied] table but BEFORE the correctly specified table
-
-<TABLE BORDER="1">
-<TR>
-<TD>
- Row 1 - Cell 1
-</TD>
-<TD>
- Row 1 - Cell 2
-</TD>
-</TR>
-<TR>
-<TD>
- Row 2 - Cell 1
-</TD>
-<TD>
- Row 2 - Cell 2
-</TD>
-</TR>
-</TABLE>
-
-Text that appears AFTER table the end!
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+<TITLE>1331849</TITLE>
+</HEAD>
+<BODY>
+Text BEFORE [implied] table
+
+<TR>
+<TD>
+Implied table cell.
+</TD>
+<TD>
+Implied because there is no opening table tag - just an opening table row tag.
+</TD>
+</TR>
+<TR>
+<TD WIDTH="2%" VALIGN="TOP">
+2nd Row of implied table
+</TD>
+<TD>
+More text
+</TD>
+</TR>
+</table>
+
+Text AFTER [implied] table but BEFORE the correctly specified table
+
+<TABLE BORDER="1">
+<TR>
+<TD>
+ Row 1 - Cell 1
+</TD>
+<TD>
+ Row 1 - Cell 2
+</TD>
+</TR>
+<TR>
+<TD>
+ Row 2 - Cell 1
+</TD>
+<TD>
+ Row 2 - Cell 2
+</TD>
+</TR>
+</TABLE>
+
+Text that appears AFTER table the end!
+
+</BODY>
+</HTML>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1333579.html
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1333579.html b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1333579.html
index fd53437..667111a 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1333579.html
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1333579.html
@@ -1,9 +1,9 @@
-<html>
-<head><title>1333579</title></head>
-<body>
-<td>inferred table</td>
-<div style="text-indent: 3%">
-<p>Paragraph Text nested in a DIV</p>
-</div>
-</body>
-</html>
+<html>
+<head><title>1333579</title></head>
+<body>
+<td>inferred table</td>
+<div style="text-indent: 3%">
+<p>Paragraph Text nested in a DIV</p>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1436578.html
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1436578.html b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1436578.html
index ed4bc54..70a17d6 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1436578.html
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1436578.html
@@ -1,11 +1,11 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
-<title>1436578</title>
-</head>
-<body>
-
-<p class='MsoSignature' style='margin-top:5.0pt'></p>
-
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+<head>
+<title>1436578</title>
+</head>
+<body>
+
+<p class='MsoSignature' style='margin-top:5.0pt'></p>
+
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1448730.xml
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1448730.xml b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1448730.xml
index 56eca36..5ced6a3 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1448730.xml
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1448730.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0"?>
-<doc>
-<blah>here is some <b>bold</b> text and here's a <customtag>customtag
-content</customtag> who's preceding space will be stripped.</blah>
-</doc>
+<?xml version="1.0"?>
+<doc>
+<blah>here is some <b>bold</b> text and here's a <customtag>customtag
+content</customtag> who's preceding space will be stripped.</blah>
+</doc>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/db23077f/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1573338.xml
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1573338.xml b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1573338.xml
index 45ae178..387b1db 100755
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1573338.xml
+++ b/DocFormats/platform/3rdparty/w3c-tidy-html5/test/input/in_1573338.xml
@@ -1,3 +1,3 @@
-<?xml version="1.0"?>
-<pdu xx=" ww" comment="
-Byte 1:BAP" />
+<?xml version="1.0"?>
+<pdu xx=" ww" comment="
+Byte 1:BAP" />
[26/33] incubator-corinthia git commit: Update copyright notice
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/consumers/dfutil/src/StringTests.h
----------------------------------------------------------------------
diff --git a/consumers/dfutil/src/StringTests.h b/consumers/dfutil/src/StringTests.h
index d864035..7971147 100644
--- a/consumers/dfutil/src/StringTests.h
+++ b/consumers/dfutil/src/StringTests.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef dfutil_StringTests_h
#define dfutil_StringTests_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/consumers/dfutil/src/StringTests.m
----------------------------------------------------------------------
diff --git a/consumers/dfutil/src/StringTests.m b/consumers/dfutil/src/StringTests.m
index 992d042..aca2524 100644
--- a/consumers/dfutil/src/StringTests.m
+++ b/consumers/dfutil/src/StringTests.m
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#import <Foundation/Foundation.h>
#include "DFPlatform.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/consumers/dfutil/src/main.c
----------------------------------------------------------------------
diff --git a/consumers/dfutil/src/main.c b/consumers/dfutil/src/main.c
index fed55ab..c3b1ba5 100644
--- a/consumers/dfutil/src/main.c
+++ b/consumers/dfutil/src/main.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "Commands.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/schemas/createimpl.js
----------------------------------------------------------------------
diff --git a/schemas/createimpl.js b/schemas/createimpl.js
index 1d65042..e3ad79d 100755
--- a/schemas/createimpl.js
+++ b/schemas/createimpl.js
@@ -1,18 +1,21 @@
#!/usr/local/bin/phantomjs --web-security=no
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
var autoGeneratedMsg = "// This file was automatically generated using schemas/generate.sh. "+
"Do not edit.";
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/schemas/relaxng.js
----------------------------------------------------------------------
diff --git a/schemas/relaxng.js b/schemas/relaxng.js
index f73a668..233a263 100755
--- a/schemas/relaxng.js
+++ b/schemas/relaxng.js
@@ -1,18 +1,21 @@
#!/usr/local/bin/phantomjs --web-security=no
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
/*
[16/33] incubator-corinthia git commit: Word: Conversion functions -
simpler organisation
Posted by ja...@apache.org.
Word: Conversion functions - simpler organisation
Instead of having WordPackageGet and WordPackagePut (which simply
created a WordConverter object and then called through to the relevant
get or put method), do this directly in the WordGet/WordPut functions.
Also move some functionality into the WordConverter get/put functions
that really belongs there, rather than outside.
Users of WordConverter no longer have to create an instance of the class
first; they simply call WordConverterGet or WordConverterPut. These
functions create an instance internally, simplifying their use. The
parameter both of these functions take are what was previosuly passed to
WordConverterNew.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/ce0e3d58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/ce0e3d58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/ce0e3d58
Branch: refs/heads/experiment64
Commit: ce0e3d58d5602f2d63a9c8d325451180108fd980
Parents: 474eb4c
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Sun Jan 11 03:41:27 2015 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Sun Jan 11 03:41:27 2015 +0700
----------------------------------------------------------------------
DocFormats/filters/ooxml/src/word/Word.c | 25 ++--------
.../filters/ooxml/src/word/WordConverter.c | 48 +++++++++++++++++---
.../filters/ooxml/src/word/WordConverter.h | 13 +++---
DocFormats/filters/ooxml/src/word/WordPackage.c | 26 -----------
DocFormats/filters/ooxml/src/word/WordPackage.h | 4 --
5 files changed, 52 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ce0e3d58/DocFormats/filters/ooxml/src/word/Word.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/Word.c b/DocFormats/filters/ooxml/src/word/Word.c
index 5e977e7..a94deaa 100644
--- a/DocFormats/filters/ooxml/src/word/Word.c
+++ b/DocFormats/filters/ooxml/src/word/Word.c
@@ -34,17 +34,10 @@ DFDocument *WordGet(DFStorage *concreteStorage, DFStorage *abstractStorage, DFEr
if (wordPackage == NULL)
goto end;
- htmlDoc = WordPackageGet(wordPackage,abstractStorage,"word",error,warnings);
- if (htmlDoc == NULL)
+ htmlDoc = DFDocumentNew();
+ if (!WordConverterGet(htmlDoc,abstractStorage,"word",wordPackage,warnings,error))
goto end;
- if (warnings->len > 0) {
- DFErrorFormat(error,"%s",warnings->data);
- goto end;
- }
-
- HTML_safeIndent(htmlDoc->docNode,0);
-
ok = 1;
end:
@@ -71,13 +64,8 @@ int WordPut(DFStorage *concreteStorage, DFStorage *abstractStorage, DFDocument *
if (wordPackage == NULL)
goto end;
- if (!WordPackagePut(wordPackage,htmlDoc,abstractStorage,idPrefix,error,warnings))
- goto end;
-
- if (warnings->len > 0) {
- DFErrorFormat(error,"%s",warnings->data);
+ if (!WordConverterPut(htmlDoc,abstractStorage,idPrefix,wordPackage,warnings,error))
goto end;
- }
if (!WordPackageSave(wordPackage,error))
goto end;
@@ -108,14 +96,9 @@ int WordCreate(DFStorage *concreteStorage, DFStorage *abstractStorage, DFDocumen
// a new word or odf file from it.
HTMLBreakBDTRefs(htmlDoc->docNode,idPrefix);
- if (!WordPackagePut(wordPackage,htmlDoc,abstractStorage,idPrefix,error,warnings))
+ if (!WordConverterPut(htmlDoc,abstractStorage,idPrefix,wordPackage,warnings,error))
goto end;
- if (warnings->len > 0) {
- DFErrorFormat(error,"%s",warnings->data);
- goto end;
- }
-
if (!WordPackageSave(wordPackage,error))
goto end;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ce0e3d58/DocFormats/filters/ooxml/src/word/WordConverter.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordConverter.c b/DocFormats/filters/ooxml/src/word/WordConverter.c
index b0cfd09..ee00253 100644
--- a/DocFormats/filters/ooxml/src/word/WordConverter.c
+++ b/DocFormats/filters/ooxml/src/word/WordConverter.c
@@ -32,6 +32,7 @@
#include "OPC.h"
#include "DFDOM.h"
#include "DFHTML.h"
+#include "DFHTMLNormalization.h"
#include "DFBDT.h"
#include "CSS.h"
#include "CSSProperties.h"
@@ -556,9 +557,9 @@ static void Word_postProcessHTMLDoc(WordConverter *conv)
// //
////////////////////////////////////////////////////////////////////////////////////////////////////
-WordConverter *WordConverterNew(DFDocument *html, DFStorage *abstractStorage,
- const char *idPrefix, WordPackage *package,
- DFBuffer *warnings)
+static WordConverter *WordConverterNew(DFDocument *html, DFStorage *abstractStorage,
+ const char *idPrefix, WordPackage *package,
+ DFBuffer *warnings)
{
WordConverter *converter = (WordConverter *)calloc(1,sizeof(WordConverter));
converter->html = DFDocumentRetain(html);
@@ -585,7 +586,7 @@ WordConverter *WordConverterNew(DFDocument *html, DFStorage *abstractStorage,
return converter;
}
-void WordConverterFree(WordConverter *converter)
+static void WordConverterFree(WordConverter *converter)
{
DFDocumentRelease(converter->html);
DFStorageRelease(converter->abstractStorage);
@@ -674,7 +675,7 @@ DFNode *WordConverterGetConcrete(WordPutData *put, DFNode *abstract)
return node;
}
-int WordConverterGet(WordConverter *converter, DFError **error)
+static int WordConverterGet2(WordConverter *converter, DFError **error)
{
converter->haveFields = Word_simplifyFields(converter->package);
Word_mergeRuns(converter->package);
@@ -709,9 +710,26 @@ int WordConverterGet(WordConverter *converter, DFError **error)
HTMLAddInternalStyleSheet(converter->html,cssText);
free(cssText);
+ HTML_safeIndent(converter->html->docNode,0);
+
+ if (converter->warnings->len > 0) {
+ DFErrorFormat(error,"%s",converter->warnings->data);
+ return 0;
+ }
+
return 1;
}
+int WordConverterGet(DFDocument *html, DFStorage *abstractStorage,
+ const char *idPrefix, WordPackage *package,
+ DFBuffer *warnings, DFError **error)
+{
+ WordConverter *converter = WordConverterNew(html,abstractStorage,idPrefix,package,warnings);
+ int ok = WordConverterGet2(converter,error);
+ WordConverterFree(converter);
+ return ok;
+}
+
static void buildListMapFromHTML(WordPutData *put, DFNode *node)
{
if (node->tag == HTML_P) {
@@ -796,8 +814,11 @@ static void addMissingDefaultStyles(WordConverter *converter)
}
}
-int WordConverterPut(WordConverter *converter, DFError **error)
+static int WordConverterPut2(WordConverter *converter, DFError **error)
{
+ HTML_normalizeDocument(converter->html);
+ HTML_pushDownInlineProperties(converter->html->docNode);
+
if (converter->package->document == NULL) {
DFErrorFormat(error,"document.xml not found");
return 0;
@@ -886,9 +907,24 @@ int WordConverterPut(WordConverter *converter, DFError **error)
DFHashTableRelease(put.numIdByHtmlId);
DFHashTableRelease(put.htmlIdByNumId);
+ if (converter->warnings->len > 0) {
+ DFErrorFormat(error,"%s",converter->warnings->data);
+ return 0;
+ }
+
return 1;
}
+int WordConverterPut(DFDocument *html, DFStorage *abstractStorage,
+ const char *idPrefix, WordPackage *package,
+ DFBuffer *warnings, DFError **error)
+{
+ WordConverter *converter = WordConverterNew(html,abstractStorage,idPrefix,package,warnings);
+ int ok = WordConverterPut2(converter,error);
+ WordConverterFree(converter);
+ return ok;
+}
+
void WordConverterWarning(WordConverter *converter, const char *format, ...)
{
va_list ap;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ce0e3d58/DocFormats/filters/ooxml/src/word/WordConverter.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordConverter.h b/DocFormats/filters/ooxml/src/word/WordConverter.h
index b4accad..eeed849 100644
--- a/DocFormats/filters/ooxml/src/word/WordConverter.h
+++ b/DocFormats/filters/ooxml/src/word/WordConverter.h
@@ -98,13 +98,12 @@ struct WordConverter {
CSSSheet *styleSheet;
};
-WordConverter *WordConverterNew(DFDocument *html, DFStorage *abstractStorage,
- const char *idPrefix, WordPackage *package,
- DFBuffer *warnings);
-void WordConverterFree(WordConverter *converter);
-
-int WordConverterGet(WordConverter *converter, DFError **error);
-int WordConverterPut(WordConverter *converter, DFError **error);
+int WordConverterGet(DFDocument *html, DFStorage *abstractStorage,
+ const char *idPrefix, WordPackage *package,
+ DFBuffer *warnings, DFError **error);
+int WordConverterPut(DFDocument *html, DFStorage *abstractStorage,
+ const char *idPrefix, WordPackage *package,
+ DFBuffer *warnings, DFError **error);
void WordConverterWarning(WordConverter *converter, const char *format, ...) ATTRIBUTE_FORMAT(printf,2,3);
char *WordStyleIdForStyle(CSSStyle *style);
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ce0e3d58/DocFormats/filters/ooxml/src/word/WordPackage.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordPackage.c b/DocFormats/filters/ooxml/src/word/WordPackage.c
index 994eca5..f6159fa 100644
--- a/DocFormats/filters/ooxml/src/word/WordPackage.c
+++ b/DocFormats/filters/ooxml/src/word/WordPackage.c
@@ -21,7 +21,6 @@
#include "DFXML.h"
#include "OPC.h"
#include "DFHTML.h"
-#include "DFHTMLNormalization.h"
#include "WordField.h"
#include "WordBookmark.h"
#include "DFCommon.h"
@@ -383,31 +382,6 @@ int WordPackageSave(WordPackage *package, DFError **error)
return 1;
}
-DFDocument *WordPackageGet(WordPackage *package, DFStorage *abstractStorage, const char *idPrefix,
- DFError **error, DFBuffer *warnings)
-{
- DFDocument *html = DFDocumentNew();
- WordConverter *converter = WordConverterNew(html,abstractStorage,idPrefix,package,warnings);
- int ok = WordConverterGet(converter,error);
- WordConverterFree(converter);
- if (!ok)
- return 0;
- return html;
-}
-
-int WordPackagePut(WordPackage *package, DFDocument *input, DFStorage *abstractStorage,
- const char *idPrefix, DFError **error, DFBuffer *warnings)
-{
- HTML_normalizeDocument(input);
- HTML_pushDownInlineProperties(input->docNode);
- WordConverter *converter = WordConverterNew(input,abstractStorage,idPrefix,package,warnings);
- int ok = WordConverterPut(converter,error);
- WordConverterFree(converter);
- if (!ok)
- return 0;
- return 1;
-}
-
static DFDocument *parsePart(WordPackage *package, OPCPart *part, DFError **error)
{
DFBuffer *content = OPCPackageReadPart(package->opc,part,error);
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ce0e3d58/DocFormats/filters/ooxml/src/word/WordPackage.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordPackage.h b/DocFormats/filters/ooxml/src/word/WordPackage.h
index 31f8457..eaef4d0 100644
--- a/DocFormats/filters/ooxml/src/word/WordPackage.h
+++ b/DocFormats/filters/ooxml/src/word/WordPackage.h
@@ -58,9 +58,5 @@ void WordPackageExpandBookmarks(WordPackage *package);
WordPackage *WordPackageOpenNew(DFStorage *storage, DFError **error);
WordPackage *WordPackageOpenFrom(DFStorage *storage, DFError **error);
int WordPackageSave(WordPackage *package, DFError **error);
-DFDocument *WordPackageGet(WordPackage *package, DFStorage *abstractStorage, const char *idPrefix,
- DFError **error, DFBuffer *warnings);
-int WordPackagePut(WordPackage *package, DFDocument *input, DFStorage *abstractStorage,
- const char *idPrefix, DFError **error, DFBuffer *warnings);
#endif
[29/33] incubator-corinthia git commit: Update copyright notice
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/latex/tests/LaTeXTests.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/latex/tests/LaTeXTests.c b/DocFormats/filters/latex/tests/LaTeXTests.c
index 16a113c..65cb9f7 100644
--- a/DocFormats/filters/latex/tests/LaTeXTests.c
+++ b/DocFormats/filters/latex/tests/LaTeXTests.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "DFUnitTest.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/odf/src/ODF.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/ODF.c b/DocFormats/filters/odf/src/ODF.c
index 299fc95..f2091de 100644
--- a/DocFormats/filters/odf/src/ODF.c
+++ b/DocFormats/filters/odf/src/ODF.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "ODF.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/odf/src/ODF.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/ODF.h b/DocFormats/filters/odf/src/ODF.h
index 245429f..b9afb52 100644
--- a/DocFormats/filters/odf/src/ODF.h
+++ b/DocFormats/filters/odf/src/ODF.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_ODF_h
#define DocFormats_ODF_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/odf/src/ODFManifest.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/ODFManifest.c b/DocFormats/filters/odf/src/ODFManifest.c
index 843408b..89b2a1f 100644
--- a/DocFormats/filters/odf/src/ODFManifest.c
+++ b/DocFormats/filters/odf/src/ODFManifest.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "ODFManifest.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/odf/src/ODFManifest.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/ODFManifest.h b/DocFormats/filters/odf/src/ODFManifest.h
index 8902f53..45eb903 100644
--- a/DocFormats/filters/odf/src/ODFManifest.h
+++ b/DocFormats/filters/odf/src/ODFManifest.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_ODFManifest_h
#define DocFormats_ODFManifest_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/odf/src/ODFPackage.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/ODFPackage.c b/DocFormats/filters/odf/src/ODFPackage.c
index c05c04c..b8d1d4b 100644
--- a/DocFormats/filters/odf/src/ODFPackage.c
+++ b/DocFormats/filters/odf/src/ODFPackage.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "ODFPackage.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/odf/src/ODFPackage.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/ODFPackage.h b/DocFormats/filters/odf/src/ODFPackage.h
index 834fef6..1dfe649 100644
--- a/DocFormats/filters/odf/src/ODFPackage.h
+++ b/DocFormats/filters/odf/src/ODFPackage.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_ODFPackage_h
#define DocFormats_ODFPackage_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/odf/src/ODFSheet.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/ODFSheet.c b/DocFormats/filters/odf/src/ODFSheet.c
index 384d0d0..fa0188c 100644
--- a/DocFormats/filters/odf/src/ODFSheet.c
+++ b/DocFormats/filters/odf/src/ODFSheet.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "ODFSheet.h"
#include "DFDOM.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/odf/src/ODFSheet.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/ODFSheet.h b/DocFormats/filters/odf/src/ODFSheet.h
index 8d1fff1..eee9697 100644
--- a/DocFormats/filters/odf/src/ODFSheet.h
+++ b/DocFormats/filters/odf/src/ODFSheet.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_ODFSheet_h
#define DocFormats_ODFSheet_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/odf/src/text/ODFText.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/text/ODFText.c b/DocFormats/filters/odf/src/text/ODFText.c
index 8e94ee9..1a7c55f 100644
--- a/DocFormats/filters/odf/src/text/ODFText.c
+++ b/DocFormats/filters/odf/src/text/ODFText.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "ODFText.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/odf/src/text/ODFText.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/text/ODFText.h b/DocFormats/filters/odf/src/text/ODFText.h
index 16f0e5a..f1b41ed 100644
--- a/DocFormats/filters/odf/src/text/ODFText.h
+++ b/DocFormats/filters/odf/src/text/ODFText.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_ODFText_h
#define DocFormats_ODFText_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/odf/tests/ODFTests.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/tests/ODFTests.c b/DocFormats/filters/odf/tests/ODFTests.c
index 9af04e8..a47f611 100644
--- a/DocFormats/filters/odf/tests/ODFTests.c
+++ b/DocFormats/filters/odf/tests/ODFTests.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFUnitTest.h"
#include <stddef.h>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/common/OOXMLTypedefs.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/common/OOXMLTypedefs.h b/DocFormats/filters/ooxml/src/common/OOXMLTypedefs.h
index bf4c2b4..61d8cbb 100644
--- a/DocFormats/filters/ooxml/src/common/OOXMLTypedefs.h
+++ b/DocFormats/filters/ooxml/src/common/OOXMLTypedefs.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_OOXMLTypedefs_h
#define DocFormats_OOXMLTypedefs_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/common/OPC.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/common/OPC.c b/DocFormats/filters/ooxml/src/common/OPC.c
index 724470c..999aad7 100644
--- a/DocFormats/filters/ooxml/src/common/OPC.c
+++ b/DocFormats/filters/ooxml/src/common/OPC.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "OPC.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/common/OPC.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/common/OPC.h b/DocFormats/filters/ooxml/src/common/OPC.h
index 76021c7..4f8d1bf 100644
--- a/DocFormats/filters/ooxml/src/common/OPC.h
+++ b/DocFormats/filters/ooxml/src/common/OPC.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_OPC_h
#define DocFormats_OPC_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/CSSClassNames.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/CSSClassNames.c b/DocFormats/filters/ooxml/src/word/CSSClassNames.c
index d33f214..7e63a6e 100644
--- a/DocFormats/filters/ooxml/src/word/CSSClassNames.c
+++ b/DocFormats/filters/ooxml/src/word/CSSClassNames.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "CSSClassNames.h"
#include "CSS.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/CSSClassNames.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/CSSClassNames.h b/DocFormats/filters/ooxml/src/word/CSSClassNames.h
index 2f29b62..b4a5b2b 100644
--- a/DocFormats/filters/ooxml/src/word/CSSClassNames.h
+++ b/DocFormats/filters/ooxml/src/word/CSSClassNames.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_CSSClassNames_h
#define DocFormats_CSSClassNames_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/Word.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/Word.c b/DocFormats/filters/ooxml/src/word/Word.c
index 4f8dd31..e9a5495 100644
--- a/DocFormats/filters/ooxml/src/word/Word.c
+++ b/DocFormats/filters/ooxml/src/word/Word.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "Word.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/Word.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/Word.h b/DocFormats/filters/ooxml/src/word/Word.h
index e871754..3eb8144 100644
--- a/DocFormats/filters/ooxml/src/word/Word.h
+++ b/DocFormats/filters/ooxml/src/word/Word.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_Word_h
#define DocFormats_Word_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordCaption.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordCaption.c b/DocFormats/filters/ooxml/src/word/WordCaption.c
index 8379c16..a64e5f0 100644
--- a/DocFormats/filters/ooxml/src/word/WordCaption.c
+++ b/DocFormats/filters/ooxml/src/word/WordCaption.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "WordCaption.h"
#include "DFCommon.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordCaption.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordCaption.h b/DocFormats/filters/ooxml/src/word/WordCaption.h
index 2110f99..8616a85 100644
--- a/DocFormats/filters/ooxml/src/word/WordCaption.h
+++ b/DocFormats/filters/ooxml/src/word/WordCaption.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordCaption_h
#define DocFormats_WordCaption_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordConverter.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordConverter.c b/DocFormats/filters/ooxml/src/word/WordConverter.c
index 0e823bb..07de6b3 100644
--- a/DocFormats/filters/ooxml/src/word/WordConverter.c
+++ b/DocFormats/filters/ooxml/src/word/WordConverter.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordConverter.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordConverter.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordConverter.h b/DocFormats/filters/ooxml/src/word/WordConverter.h
index 5451540..5cda316 100644
--- a/DocFormats/filters/ooxml/src/word/WordConverter.h
+++ b/DocFormats/filters/ooxml/src/word/WordConverter.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordConverter_h
#define DocFormats_WordConverter_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordGC.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordGC.c b/DocFormats/filters/ooxml/src/word/WordGC.c
index 2698f71..0df299a 100644
--- a/DocFormats/filters/ooxml/src/word/WordGC.c
+++ b/DocFormats/filters/ooxml/src/word/WordGC.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordGC.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordGC.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordGC.h b/DocFormats/filters/ooxml/src/word/WordGC.h
index 03f10e4..246c0a6 100644
--- a/DocFormats/filters/ooxml/src/word/WordGC.h
+++ b/DocFormats/filters/ooxml/src/word/WordGC.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordGC_h
#define DocFormats_WordGC_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordLists.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordLists.c b/DocFormats/filters/ooxml/src/word/WordLists.c
index 8416fce..e7381a5 100644
--- a/DocFormats/filters/ooxml/src/word/WordLists.c
+++ b/DocFormats/filters/ooxml/src/word/WordLists.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordLists.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordLists.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordLists.h b/DocFormats/filters/ooxml/src/word/WordLists.h
index 58a5ac0..9c146c3 100644
--- a/DocFormats/filters/ooxml/src/word/WordLists.h
+++ b/DocFormats/filters/ooxml/src/word/WordLists.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordLists_h
#define DocFormats_WordLists_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordNotes.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordNotes.c b/DocFormats/filters/ooxml/src/word/WordNotes.c
index 06caa60..f222be7 100644
--- a/DocFormats/filters/ooxml/src/word/WordNotes.c
+++ b/DocFormats/filters/ooxml/src/word/WordNotes.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordNotes.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordNotes.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordNotes.h b/DocFormats/filters/ooxml/src/word/WordNotes.h
index 5e59bcc..ddeb106 100644
--- a/DocFormats/filters/ooxml/src/word/WordNotes.h
+++ b/DocFormats/filters/ooxml/src/word/WordNotes.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordNotes_h
#define DocFormats_WordNotes_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordNumbering.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordNumbering.c b/DocFormats/filters/ooxml/src/word/WordNumbering.c
index 76408e5..ed60ca1 100644
--- a/DocFormats/filters/ooxml/src/word/WordNumbering.c
+++ b/DocFormats/filters/ooxml/src/word/WordNumbering.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordNumbering.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordNumbering.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordNumbering.h b/DocFormats/filters/ooxml/src/word/WordNumbering.h
index 8d0e1cb..cc38b58 100644
--- a/DocFormats/filters/ooxml/src/word/WordNumbering.h
+++ b/DocFormats/filters/ooxml/src/word/WordNumbering.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordNumbering_h
#define DocFormats_WordNumbering_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordObjects.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordObjects.c b/DocFormats/filters/ooxml/src/word/WordObjects.c
index 085a494..543b19b 100644
--- a/DocFormats/filters/ooxml/src/word/WordObjects.c
+++ b/DocFormats/filters/ooxml/src/word/WordObjects.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "WordObjects.h"
#include "WordPackage.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordObjects.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordObjects.h b/DocFormats/filters/ooxml/src/word/WordObjects.h
index 0a08525..6844bb3 100644
--- a/DocFormats/filters/ooxml/src/word/WordObjects.h
+++ b/DocFormats/filters/ooxml/src/word/WordObjects.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordObjects_h
#define DocFormats_WordObjects_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordPackage.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordPackage.c b/DocFormats/filters/ooxml/src/word/WordPackage.c
index f6159fa..8e62243 100644
--- a/DocFormats/filters/ooxml/src/word/WordPackage.c
+++ b/DocFormats/filters/ooxml/src/word/WordPackage.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordPackage.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordPackage.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordPackage.h b/DocFormats/filters/ooxml/src/word/WordPackage.h
index eaef4d0..df318ef 100644
--- a/DocFormats/filters/ooxml/src/word/WordPackage.h
+++ b/DocFormats/filters/ooxml/src/word/WordPackage.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordPackage_h
#define DocFormats_WordPackage_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordSection.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordSection.c b/DocFormats/filters/ooxml/src/word/WordSection.c
index af866dc..8803370 100644
--- a/DocFormats/filters/ooxml/src/word/WordSection.c
+++ b/DocFormats/filters/ooxml/src/word/WordSection.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "WordSection.h"
#include "WordStyles.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordSection.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordSection.h b/DocFormats/filters/ooxml/src/word/WordSection.h
index 058ce5c..0cbffa5 100644
--- a/DocFormats/filters/ooxml/src/word/WordSection.h
+++ b/DocFormats/filters/ooxml/src/word/WordSection.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordSection_h
#define DocFormats_WordSection_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordSettings.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordSettings.c b/DocFormats/filters/ooxml/src/word/WordSettings.c
index 2c17786..6ada764 100644
--- a/DocFormats/filters/ooxml/src/word/WordSettings.c
+++ b/DocFormats/filters/ooxml/src/word/WordSettings.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordSettings.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordSettings.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordSettings.h b/DocFormats/filters/ooxml/src/word/WordSettings.h
index bb20e01..059aa96 100644
--- a/DocFormats/filters/ooxml/src/word/WordSettings.h
+++ b/DocFormats/filters/ooxml/src/word/WordSettings.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordSettings_h
#define DocFormats_WordSettings_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordSheet.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordSheet.c b/DocFormats/filters/ooxml/src/word/WordSheet.c
index 74f9fdc..f6ef195 100644
--- a/DocFormats/filters/ooxml/src/word/WordSheet.c
+++ b/DocFormats/filters/ooxml/src/word/WordSheet.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "WordSheet.h"
#include "DFDOM.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordSheet.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordSheet.h b/DocFormats/filters/ooxml/src/word/WordSheet.h
index 0a08714..da6a8ce 100644
--- a/DocFormats/filters/ooxml/src/word/WordSheet.h
+++ b/DocFormats/filters/ooxml/src/word/WordSheet.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordSheet_h
#define DocFormats_WordSheet_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordStyles.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordStyles.c b/DocFormats/filters/ooxml/src/word/WordStyles.c
index c7e5e8a..6f73508 100644
--- a/DocFormats/filters/ooxml/src/word/WordStyles.c
+++ b/DocFormats/filters/ooxml/src/word/WordStyles.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordStyles.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordStyles.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordStyles.h b/DocFormats/filters/ooxml/src/word/WordStyles.h
index b5cbb1b..19370b7 100644
--- a/DocFormats/filters/ooxml/src/word/WordStyles.h
+++ b/DocFormats/filters/ooxml/src/word/WordStyles.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordStyles_h
#define DocFormats_WordStyles_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordTheme.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordTheme.c b/DocFormats/filters/ooxml/src/word/WordTheme.c
index dbd9cc3..e463360 100644
--- a/DocFormats/filters/ooxml/src/word/WordTheme.c
+++ b/DocFormats/filters/ooxml/src/word/WordTheme.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordTheme.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordTheme.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordTheme.h b/DocFormats/filters/ooxml/src/word/WordTheme.h
index 7bfc4fc..96378f7 100644
--- a/DocFormats/filters/ooxml/src/word/WordTheme.h
+++ b/DocFormats/filters/ooxml/src/word/WordTheme.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_WordTheme_h
#define DocFormats_WordTheme_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/filters/ooxml/src/word/WordWhitespace.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordWhitespace.c b/DocFormats/filters/ooxml/src/word/WordWhitespace.c
index 5769cf9..ade5d5c 100644
--- a/DocFormats/filters/ooxml/src/word/WordWhitespace.c
+++ b/DocFormats/filters/ooxml/src/word/WordWhitespace.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "WordWhitespace.h"
[31/33] incubator-corinthia git commit: Update copyright notice
Posted by ja...@apache.org.
Update copyright notice
Place the copyright notice described at:
http://www.apache.org/legal/src-headers.html
in all source and header files, with the exception of those in the
platform directory (which will be taken care of in a pending merge by
Jan). This notice takes place of the previous one which specifically
mentioned UX Productivity.
Also add a NOTICE.txt file based on the format described in the above
link. The copyright ownership statement for UX Productivity now lives in
this file. Anyone else who has made contributions to the project should
add their own statement to this file.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/f9214c47
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/f9214c47
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/f9214c47
Branch: refs/heads/experiment64
Commit: f9214c47180456f34267c4d40f3ce190bb49c674
Parents: c94ae5d
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Fri Feb 13 10:11:54 2015 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Fri Feb 13 10:11:54 2015 +0700
----------------------------------------------------------------------
DocFormats/DocFormats.c | 17 +++++++++++++
DocFormats/api/headers/DocFormats/DFError.h | 25 +++++++++++--------
DocFormats/api/headers/DocFormats/DFStorage.h | 25 +++++++++++--------
.../api/headers/DocFormats/DFXMLForward.h | 25 +++++++++++--------
DocFormats/api/headers/DocFormats/DocFormats.h | 25 +++++++++++--------
DocFormats/api/headers/DocFormats/Formats.h | 25 +++++++++++--------
DocFormats/api/headers/DocFormats/Operations.h | 25 +++++++++++--------
DocFormats/api/src/Formats.c | 25 +++++++++++--------
DocFormats/api/src/Operations.c | 25 +++++++++++--------
DocFormats/api/tests/APITests.c | 25 +++++++++++--------
DocFormats/core/src/common/DFBDT.c | 25 +++++++++++--------
DocFormats/core/src/common/DFBDT.h | 25 +++++++++++--------
DocFormats/core/src/common/DFClassNames.h | 25 +++++++++++--------
DocFormats/core/src/common/DFTable.c | 25 +++++++++++--------
DocFormats/core/src/common/DFTable.h | 25 +++++++++++--------
DocFormats/core/src/css/CSS.c | 25 +++++++++++--------
DocFormats/core/src/css/CSS.h | 25 +++++++++++--------
DocFormats/core/src/css/CSSLength.c | 25 +++++++++++--------
DocFormats/core/src/css/CSSLength.h | 25 +++++++++++--------
DocFormats/core/src/css/CSSParser.c | 25 +++++++++++--------
DocFormats/core/src/css/CSSParser.h | 25 +++++++++++--------
DocFormats/core/src/css/CSSProperties.c | 25 +++++++++++--------
DocFormats/core/src/css/CSSProperties.h | 25 +++++++++++--------
DocFormats/core/src/css/CSSSelector.c | 25 +++++++++++--------
DocFormats/core/src/css/CSSSelector.h | 25 +++++++++++--------
DocFormats/core/src/css/CSSSheet.c | 25 +++++++++++--------
DocFormats/core/src/css/CSSSheet.h | 25 +++++++++++--------
DocFormats/core/src/css/CSSStyle.c | 25 +++++++++++--------
DocFormats/core/src/css/CSSStyle.h | 25 +++++++++++--------
DocFormats/core/src/css/CSSSyntax.c | 25 +++++++++++--------
DocFormats/core/src/css/CSSSyntax.h | 25 +++++++++++--------
DocFormats/core/src/html/DFHTDocument.c | 25 +++++++++++--------
DocFormats/core/src/html/DFHTDocument.h | 25 +++++++++++--------
DocFormats/core/src/html/DFHTML.c | 25 +++++++++++--------
DocFormats/core/src/html/DFHTML.h | 25 +++++++++++--------
DocFormats/core/src/html/DFHTMLNormalization.c | 25 +++++++++++--------
DocFormats/core/src/html/DFHTMLNormalization.h | 25 +++++++++++--------
DocFormats/core/src/html/DFHTMLTables.c | 25 +++++++++++--------
DocFormats/core/src/html/DFHTMLTables.h | 25 +++++++++++--------
DocFormats/core/src/html/DFTidyHelper.c | 25 +++++++++++--------
DocFormats/core/src/html/DFTidyHelper.h | 25 +++++++++++--------
DocFormats/core/src/html/DFTidyWrapper.c | 25 +++++++++++--------
DocFormats/core/src/html/DFTidyWrapper.h | 25 +++++++++++--------
DocFormats/core/src/lib/DFAllocator.c | 25 +++++++++++--------
DocFormats/core/src/lib/DFAllocator.h | 25 +++++++++++--------
DocFormats/core/src/lib/DFArray.c | 25 +++++++++++--------
DocFormats/core/src/lib/DFArray.h | 25 +++++++++++--------
DocFormats/core/src/lib/DFBuffer.c | 25 +++++++++++--------
DocFormats/core/src/lib/DFBuffer.h | 25 +++++++++++--------
DocFormats/core/src/lib/DFCallback.c | 25 +++++++++++--------
DocFormats/core/src/lib/DFCallback.h | 25 +++++++++++--------
DocFormats/core/src/lib/DFCharacterSet.c | 25 +++++++++++--------
DocFormats/core/src/lib/DFCharacterSet.h | 25 +++++++++++--------
DocFormats/core/src/lib/DFError.c | 25 +++++++++++--------
DocFormats/core/src/lib/DFFilesystem.c | 25 +++++++++++--------
DocFormats/core/src/lib/DFFilesystem.h | 25 +++++++++++--------
DocFormats/core/src/lib/DFHashTable.c | 25 +++++++++++--------
DocFormats/core/src/lib/DFHashTable.h | 25 +++++++++++--------
DocFormats/core/src/lib/DFStorage.c | 25 +++++++++++--------
DocFormats/core/src/lib/DFString.c | 25 +++++++++++--------
DocFormats/core/src/lib/DFString.h | 25 +++++++++++--------
DocFormats/core/src/lib/DFZipFile.c | 25 +++++++++++--------
DocFormats/core/src/lib/DFZipFile.h | 25 +++++++++++--------
DocFormats/core/src/lib/TextPackage.c | 25 +++++++++++--------
DocFormats/core/src/lib/TextPackage.h | 25 +++++++++++--------
DocFormats/core/src/xml/DFChanges.c | 25 +++++++++++--------
DocFormats/core/src/xml/DFChanges.h | 25 +++++++++++--------
DocFormats/core/src/xml/DFDOM.c | 25 +++++++++++--------
DocFormats/core/src/xml/DFDOM.h | 25 +++++++++++--------
DocFormats/core/src/xml/DFMarkupCompatibility.c | 25 +++++++++++--------
DocFormats/core/src/xml/DFMarkupCompatibility.h | 25 +++++++++++--------
DocFormats/core/src/xml/DFNameMap.c | 25 +++++++++++--------
DocFormats/core/src/xml/DFNameMap.h | 25 +++++++++++--------
DocFormats/core/src/xml/DFXML.c | 25 +++++++++++--------
DocFormats/core/src/xml/DFXML.h | 25 +++++++++++--------
DocFormats/core/tests/common/BDTTests.c | 25 +++++++++++--------
DocFormats/core/tests/common/BDTTests.h | 25 +++++++++++--------
DocFormats/core/tests/css/CSSTests.c | 25 +++++++++++--------
DocFormats/core/tests/html/HTMLPlain.c | 25 +++++++++++--------
DocFormats/core/tests/html/HTMLPlain.h | 25 +++++++++++--------
DocFormats/core/tests/html/HTMLTests.c | 25 +++++++++++--------
DocFormats/core/tests/lib/LibTests.c | 25 +++++++++++--------
DocFormats/core/tests/xml/XMLTests.c | 25 +++++++++++--------
DocFormats/filters/latex/src/HTMLToLaTeX.c | 25 +++++++++++--------
DocFormats/filters/latex/src/HTMLToLaTeX.h | 25 +++++++++++--------
DocFormats/filters/latex/tests/LaTeXTests.c | 25 +++++++++++--------
DocFormats/filters/odf/src/ODF.c | 25 +++++++++++--------
DocFormats/filters/odf/src/ODF.h | 25 +++++++++++--------
DocFormats/filters/odf/src/ODFManifest.c | 25 +++++++++++--------
DocFormats/filters/odf/src/ODFManifest.h | 25 +++++++++++--------
DocFormats/filters/odf/src/ODFPackage.c | 25 +++++++++++--------
DocFormats/filters/odf/src/ODFPackage.h | 25 +++++++++++--------
DocFormats/filters/odf/src/ODFSheet.c | 25 +++++++++++--------
DocFormats/filters/odf/src/ODFSheet.h | 25 +++++++++++--------
DocFormats/filters/odf/src/text/ODFText.c | 25 +++++++++++--------
DocFormats/filters/odf/src/text/ODFText.h | 25 +++++++++++--------
DocFormats/filters/odf/tests/ODFTests.c | 25 +++++++++++--------
.../filters/ooxml/src/common/OOXMLTypedefs.h | 25 +++++++++++--------
DocFormats/filters/ooxml/src/common/OPC.c | 25 +++++++++++--------
DocFormats/filters/ooxml/src/common/OPC.h | 25 +++++++++++--------
.../filters/ooxml/src/word/CSSClassNames.c | 25 +++++++++++--------
.../filters/ooxml/src/word/CSSClassNames.h | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/Word.c | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/Word.h | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/WordCaption.c | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/WordCaption.h | 25 +++++++++++--------
.../filters/ooxml/src/word/WordConverter.c | 25 +++++++++++--------
.../filters/ooxml/src/word/WordConverter.h | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/WordGC.c | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/WordGC.h | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/WordLists.c | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/WordLists.h | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/WordNotes.c | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/WordNotes.h | 25 +++++++++++--------
.../filters/ooxml/src/word/WordNumbering.c | 25 +++++++++++--------
.../filters/ooxml/src/word/WordNumbering.h | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/WordObjects.c | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/WordObjects.h | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/WordPackage.c | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/WordPackage.h | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/WordSection.c | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/WordSection.h | 25 +++++++++++--------
.../filters/ooxml/src/word/WordSettings.c | 25 +++++++++++--------
.../filters/ooxml/src/word/WordSettings.h | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/WordSheet.c | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/WordSheet.h | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/WordStyles.c | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/WordStyles.h | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/WordTheme.c | 25 +++++++++++--------
DocFormats/filters/ooxml/src/word/WordTheme.h | 25 +++++++++++--------
.../filters/ooxml/src/word/WordWhitespace.c | 25 +++++++++++--------
.../filters/ooxml/src/word/WordWhitespace.h | 25 +++++++++++--------
.../ooxml/src/word/formatting/WordCommonPr.c | 25 +++++++++++--------
.../ooxml/src/word/formatting/WordCommonPr.h | 25 +++++++++++--------
.../ooxml/src/word/formatting/WordNumPr.c | 25 +++++++++++--------
.../ooxml/src/word/formatting/WordNumPr.h | 25 +++++++++++--------
.../filters/ooxml/src/word/formatting/WordPPr.c | 25 +++++++++++--------
.../filters/ooxml/src/word/formatting/WordPPr.h | 25 +++++++++++--------
.../filters/ooxml/src/word/formatting/WordRPr.c | 25 +++++++++++--------
.../filters/ooxml/src/word/formatting/WordRPr.h | 25 +++++++++++--------
.../ooxml/src/word/formatting/WordTblPr.c | 25 +++++++++++--------
.../ooxml/src/word/formatting/WordTblPr.h | 25 +++++++++++--------
.../ooxml/src/word/lenses/WordBlockLevel.c | 25 +++++++++++--------
.../filters/ooxml/src/word/lenses/WordBody.c | 25 +++++++++++--------
.../ooxml/src/word/lenses/WordBookmark.c | 25 +++++++++++--------
.../ooxml/src/word/lenses/WordBookmark.h | 25 +++++++++++--------
.../filters/ooxml/src/word/lenses/WordChange.c | 25 +++++++++++--------
.../ooxml/src/word/lenses/WordDocument.c | 25 +++++++++++--------
.../filters/ooxml/src/word/lenses/WordDrawing.c | 25 +++++++++++--------
.../filters/ooxml/src/word/lenses/WordDrawing.h | 25 +++++++++++--------
.../ooxml/src/word/lenses/WordEquation.c | 25 +++++++++++--------
.../filters/ooxml/src/word/lenses/WordField.c | 25 +++++++++++--------
.../filters/ooxml/src/word/lenses/WordField.h | 25 +++++++++++--------
.../ooxml/src/word/lenses/WordHyperlink.c | 25 +++++++++++--------
.../filters/ooxml/src/word/lenses/WordLenses.c | 25 +++++++++++--------
.../filters/ooxml/src/word/lenses/WordLenses.h | 25 +++++++++++--------
.../ooxml/src/word/lenses/WordParagraph.c | 25 +++++++++++--------
.../src/word/lenses/WordParagraphContent.c | 25 +++++++++++--------
.../filters/ooxml/src/word/lenses/WordRun.c | 25 +++++++++++--------
.../ooxml/src/word/lenses/WordRunContent.c | 25 +++++++++++--------
.../ooxml/src/word/lenses/WordSmartTag.c | 25 +++++++++++--------
.../filters/ooxml/src/word/lenses/WordTable.c | 25 +++++++++++--------
DocFormats/filters/ooxml/tests/word/WordPlain.c | 25 +++++++++++--------
DocFormats/filters/ooxml/tests/word/WordPlain.h | 25 +++++++++++--------
DocFormats/filters/ooxml/tests/word/WordTests.c | 25 +++++++++++--------
DocFormats/headers/DFCommon.h | 25 +++++++++++--------
DocFormats/headers/DFCore.h | 25 +++++++++++--------
DocFormats/headers/DFPlatform.h | 25 +++++++++++--------
DocFormats/headers/DFTypes.h | 25 +++++++++++--------
DocFormats/unittest/DFUnitTest.c | 25 +++++++++++--------
DocFormats/unittest/DFUnitTest.h | 25 +++++++++++--------
Editor/src/AutoCorrect.js | 25 +++++++++++--------
Editor/src/ChangeTracking.js | 25 +++++++++++--------
Editor/src/Clipboard.js | 25 +++++++++++--------
Editor/src/Cursor.js | 25 +++++++++++--------
Editor/src/DOM.js | 25 +++++++++++--------
Editor/src/Editor.js | 25 +++++++++++--------
Editor/src/Equations.js | 25 +++++++++++--------
Editor/src/Figures.js | 25 +++++++++++--------
Editor/src/Formatting.js | 25 +++++++++++--------
Editor/src/Hierarchy.js | 25 +++++++++++--------
Editor/src/Input.js | 25 +++++++++++--------
Editor/src/Lists.js | 25 +++++++++++--------
Editor/src/Main.js | 25 +++++++++++--------
Editor/src/Metadata.js | 25 +++++++++++--------
Editor/src/NodeSet.js | 25 +++++++++++--------
Editor/src/Outline.js | 25 +++++++++++--------
Editor/src/Position.js | 25 +++++++++++--------
Editor/src/PostponedActions.js | 25 +++++++++++--------
Editor/src/Preview.js | 25 +++++++++++--------
Editor/src/Range.js | 25 +++++++++++--------
Editor/src/Scan.js | 25 +++++++++++--------
Editor/src/Selection.js | 25 +++++++++++--------
Editor/src/StringBuilder.js | 25 +++++++++++--------
Editor/src/Styles.js | 25 +++++++++++--------
Editor/src/Tables.js | 25 +++++++++++--------
Editor/src/Text.js | 25 +++++++++++--------
Editor/src/UndoManager.js | 25 +++++++++++--------
Editor/src/Viewport.js | 25 +++++++++++--------
Editor/src/first.js | 25 +++++++++++--------
Editor/src/traversal.js | 25 +++++++++++--------
Editor/src/types.js | 25 +++++++++++--------
Editor/src/util.js | 25 +++++++++++--------
Editor/tests/PrettyPrinter.js | 25 +++++++++++--------
Editor/tests/autocorrect/AutoCorrectTests.js | 25 +++++++++++--------
Editor/tests/dom/RangeTest.js | 25 +++++++++++--------
Editor/tests/figures/FiguresTest.js | 25 +++++++++++--------
Editor/tests/input/InputTests.js | 25 +++++++++++--------
Editor/tests/outline/OutlineTest.js | 25 +++++++++++--------
Editor/tests/position/validPositions.js | 25 +++++++++++--------
Editor/tests/scan/ScanTests.js | 25 +++++++++++--------
Editor/tests/selection/PositionTests.js | 25 +++++++++++--------
Editor/tests/server.js | 25 +++++++++++--------
Editor/tests/tables/TableTests.js | 25 +++++++++++--------
Editor/tests/test-structure.html | 19 +++++++++++++-
Editor/tests/testharness.js | 25 +++++++++++--------
Editor/tests/testlib.js | 25 +++++++++++--------
Editor/tests/text/TextTests.js | 25 +++++++++++--------
Editor/tests/undo/UndoTests.js | 25 +++++++++++--------
NOTICE.txt | 7 ++++++
build/build_instructions.txt | Bin 7208 -> 0 bytes
consumers/dfconvert/src/main.c | 25 +++++++++++--------
consumers/dftest/src/main.c | 25 +++++++++++--------
consumers/dfutil/src/Commands.c | 25 +++++++++++--------
consumers/dfutil/src/Commands.h | 25 +++++++++++--------
consumers/dfutil/src/FunctionTests.h | 25 +++++++++++--------
consumers/dfutil/src/FunctionTests.m | 25 +++++++++++--------
consumers/dfutil/src/StringTests.h | 25 +++++++++++--------
consumers/dfutil/src/StringTests.m | 25 +++++++++++--------
consumers/dfutil/src/main.c | 25 +++++++++++--------
schemas/createimpl.js | 25 +++++++++++--------
schemas/relaxng.js | 25 +++++++++++--------
232 files changed, 3234 insertions(+), 2509 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/DocFormats.c
----------------------------------------------------------------------
diff --git a/DocFormats/DocFormats.c b/DocFormats/DocFormats.c
index ecf1616..431970a 100644
--- a/DocFormats/DocFormats.c
+++ b/DocFormats/DocFormats.c
@@ -1,3 +1,20 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
void DocFormats()
{
}
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/api/headers/DocFormats/DFError.h
----------------------------------------------------------------------
diff --git a/DocFormats/api/headers/DocFormats/DFError.h b/DocFormats/api/headers/DocFormats/DFError.h
index 1742d98..fb6343f 100644
--- a/DocFormats/api/headers/DocFormats/DFError.h
+++ b/DocFormats/api/headers/DocFormats/DFError.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFError_h
#define DocFormats_DFError_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/api/headers/DocFormats/DFStorage.h
----------------------------------------------------------------------
diff --git a/DocFormats/api/headers/DocFormats/DFStorage.h b/DocFormats/api/headers/DocFormats/DFStorage.h
index 34bee44..2c27293 100644
--- a/DocFormats/api/headers/DocFormats/DFStorage.h
+++ b/DocFormats/api/headers/DocFormats/DFStorage.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFStorage_h
#define DocFormats_DFStorage_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/api/headers/DocFormats/DFXMLForward.h
----------------------------------------------------------------------
diff --git a/DocFormats/api/headers/DocFormats/DFXMLForward.h b/DocFormats/api/headers/DocFormats/DFXMLForward.h
index ddfa7f6..6a2a740 100644
--- a/DocFormats/api/headers/DocFormats/DFXMLForward.h
+++ b/DocFormats/api/headers/DocFormats/DFXMLForward.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFXMLForward_h
#define DocFormats_DFXMLForward_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/api/headers/DocFormats/DocFormats.h
----------------------------------------------------------------------
diff --git a/DocFormats/api/headers/DocFormats/DocFormats.h b/DocFormats/api/headers/DocFormats/DocFormats.h
index 6de204f..f5c3472 100644
--- a/DocFormats/api/headers/DocFormats/DocFormats.h
+++ b/DocFormats/api/headers/DocFormats/DocFormats.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include <DocFormats/Operations.h>
#include <DocFormats/Formats.h>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/api/headers/DocFormats/Formats.h
----------------------------------------------------------------------
diff --git a/DocFormats/api/headers/DocFormats/Formats.h b/DocFormats/api/headers/DocFormats/Formats.h
index fb83f40..49c8aee 100644
--- a/DocFormats/api/headers/DocFormats/Formats.h
+++ b/DocFormats/api/headers/DocFormats/Formats.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_Formats_h
#define DocFormats_Formats_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/api/headers/DocFormats/Operations.h
----------------------------------------------------------------------
diff --git a/DocFormats/api/headers/DocFormats/Operations.h b/DocFormats/api/headers/DocFormats/Operations.h
index 804bebc..1bb6ee2 100644
--- a/DocFormats/api/headers/DocFormats/Operations.h
+++ b/DocFormats/api/headers/DocFormats/Operations.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_Operations_h
#define DocFormats_Operations_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/api/src/Formats.c
----------------------------------------------------------------------
diff --git a/DocFormats/api/src/Formats.c b/DocFormats/api/src/Formats.c
index 20d77dd..289c288 100644
--- a/DocFormats/api/src/Formats.c
+++ b/DocFormats/api/src/Formats.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include <DocFormats/Formats.h>
#include "DFPlatform.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/api/src/Operations.c
----------------------------------------------------------------------
diff --git a/DocFormats/api/src/Operations.c b/DocFormats/api/src/Operations.c
index 3b4500f..6978ffd 100644
--- a/DocFormats/api/src/Operations.c
+++ b/DocFormats/api/src/Operations.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include <DocFormats/Operations.h>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/api/tests/APITests.c
----------------------------------------------------------------------
diff --git a/DocFormats/api/tests/APITests.c b/DocFormats/api/tests/APITests.c
index 57659b4..73cbe6e 100644
--- a/DocFormats/api/tests/APITests.c
+++ b/DocFormats/api/tests/APITests.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFUnitTest.h"
#include <stddef.h>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/common/DFBDT.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/common/DFBDT.c b/DocFormats/core/src/common/DFBDT.c
index 8a34599..3568668 100644
--- a/DocFormats/core/src/common/DFBDT.c
+++ b/DocFormats/core/src/common/DFBDT.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "DFBDT.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/common/DFBDT.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/common/DFBDT.h b/DocFormats/core/src/common/DFBDT.h
index 253049a..7393dae 100644
--- a/DocFormats/core/src/common/DFBDT.h
+++ b/DocFormats/core/src/common/DFBDT.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFBDT_h
#define DocFormats_DFBDT_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/common/DFClassNames.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/common/DFClassNames.h b/DocFormats/core/src/common/DFClassNames.h
index 914d96f..7cd07e1 100644
--- a/DocFormats/core/src/common/DFClassNames.h
+++ b/DocFormats/core/src/common/DFClassNames.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFClassNames_h
#define DocFormats_DFClassNames_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/common/DFTable.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/common/DFTable.c b/DocFormats/core/src/common/DFTable.c
index c99e6e1..e8f3362 100644
--- a/DocFormats/core/src/common/DFTable.c
+++ b/DocFormats/core/src/common/DFTable.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFTable.h"
#include "DFDOM.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/common/DFTable.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/common/DFTable.h b/DocFormats/core/src/common/DFTable.h
index f34a7b2..fff4f06 100644
--- a/DocFormats/core/src/common/DFTable.h
+++ b/DocFormats/core/src/common/DFTable.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFTable_h
#define DocFormats_DFTable_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/css/CSS.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSS.c b/DocFormats/core/src/css/CSS.c
index f86b496..a052f10 100644
--- a/DocFormats/core/src/css/CSS.c
+++ b/DocFormats/core/src/css/CSS.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "CSS.h"
#include "CSSParser.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/css/CSS.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSS.h b/DocFormats/core/src/css/CSS.h
index 2ff787e..ccd64e1 100644
--- a/DocFormats/core/src/css/CSS.h
+++ b/DocFormats/core/src/css/CSS.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_CSS_h
#define DocFormats_CSS_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/css/CSSLength.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSLength.c b/DocFormats/core/src/css/CSSLength.c
index 97e6824..71ebb90 100644
--- a/DocFormats/core/src/css/CSSLength.c
+++ b/DocFormats/core/src/css/CSSLength.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "CSSLength.h"
#include "DFCommon.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/css/CSSLength.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSLength.h b/DocFormats/core/src/css/CSSLength.h
index d73d000..fb4eb50 100644
--- a/DocFormats/core/src/css/CSSLength.h
+++ b/DocFormats/core/src/css/CSSLength.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_CSSLength_h
#define DocFormats_CSSLength_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/css/CSSParser.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSParser.c b/DocFormats/core/src/css/CSSParser.c
index 5f6c546..9a7a4c1 100644
--- a/DocFormats/core/src/css/CSSParser.c
+++ b/DocFormats/core/src/css/CSSParser.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "CSSParser.h"
#include "CSS.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/css/CSSParser.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSParser.h b/DocFormats/core/src/css/CSSParser.h
index 1491cf0..d1adf5c 100644
--- a/DocFormats/core/src/css/CSSParser.h
+++ b/DocFormats/core/src/css/CSSParser.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_CSSParser_h
#define DocFormats_CSSParser_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/css/CSSProperties.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSProperties.c b/DocFormats/core/src/css/CSSProperties.c
index e3f4973..1a9bb3e 100644
--- a/DocFormats/core/src/css/CSSProperties.c
+++ b/DocFormats/core/src/css/CSSProperties.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "CSSProperties.h"
#include "CSS.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/css/CSSProperties.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSProperties.h b/DocFormats/core/src/css/CSSProperties.h
index 22de4fd..0ea4eab 100644
--- a/DocFormats/core/src/css/CSSProperties.h
+++ b/DocFormats/core/src/css/CSSProperties.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_CSSProperties_h
#define DocFormats_CSSProperties_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/css/CSSSelector.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSSelector.c b/DocFormats/core/src/css/CSSSelector.c
index 52220be..dcd2b81 100644
--- a/DocFormats/core/src/css/CSSSelector.c
+++ b/DocFormats/core/src/css/CSSSelector.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "CSSSelector.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/css/CSSSelector.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSSelector.h b/DocFormats/core/src/css/CSSSelector.h
index 6e9c283..4151c41 100644
--- a/DocFormats/core/src/css/CSSSelector.h
+++ b/DocFormats/core/src/css/CSSSelector.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_CSSSelector_h
#define DocFormats_CSSSelector_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/css/CSSSheet.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSSheet.c b/DocFormats/core/src/css/CSSSheet.c
index 151201f..d0312aa 100644
--- a/DocFormats/core/src/css/CSSSheet.c
+++ b/DocFormats/core/src/css/CSSSheet.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "CSSSheet.h"
#include "CSS.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/css/CSSSheet.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSSheet.h b/DocFormats/core/src/css/CSSSheet.h
index 2d71a91..1ff03e8 100644
--- a/DocFormats/core/src/css/CSSSheet.h
+++ b/DocFormats/core/src/css/CSSSheet.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_CSSSheet_h
#define DocFormats_CSSSheet_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/css/CSSStyle.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSStyle.c b/DocFormats/core/src/css/CSSStyle.c
index 73c9445..38c59c4 100644
--- a/DocFormats/core/src/css/CSSStyle.c
+++ b/DocFormats/core/src/css/CSSStyle.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "CSSStyle.h"
#include "CSSSheet.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/css/CSSStyle.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSStyle.h b/DocFormats/core/src/css/CSSStyle.h
index 8059ec4..ae1ff4e 100644
--- a/DocFormats/core/src/css/CSSStyle.h
+++ b/DocFormats/core/src/css/CSSStyle.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_CSSStyle_h
#define DocFormats_CSSStyle_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/css/CSSSyntax.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSSyntax.c b/DocFormats/core/src/css/CSSSyntax.c
index 9147d44..dfab238 100644
--- a/DocFormats/core/src/css/CSSSyntax.c
+++ b/DocFormats/core/src/css/CSSSyntax.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "CSSSyntax.h"
#include "DFCommon.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/css/CSSSyntax.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSSyntax.h b/DocFormats/core/src/css/CSSSyntax.h
index 09e8fd1..945f118 100644
--- a/DocFormats/core/src/css/CSSSyntax.h
+++ b/DocFormats/core/src/css/CSSSyntax.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_CSSSyntax_h
#define DocFormats_CSSSyntax_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/html/DFHTDocument.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFHTDocument.c b/DocFormats/core/src/html/DFHTDocument.c
index 6d6c3f0..146b559 100644
--- a/DocFormats/core/src/html/DFHTDocument.c
+++ b/DocFormats/core/src/html/DFHTDocument.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "DFHTDocument.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/html/DFHTDocument.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFHTDocument.h b/DocFormats/core/src/html/DFHTDocument.h
index 6b5860d..c5aac49 100644
--- a/DocFormats/core/src/html/DFHTDocument.h
+++ b/DocFormats/core/src/html/DFHTDocument.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFHTDocument_h
#define DocFormats_DFHTDocument_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/html/DFHTML.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFHTML.c b/DocFormats/core/src/html/DFHTML.c
index 0f2a348..e600517 100644
--- a/DocFormats/core/src/html/DFHTML.c
+++ b/DocFormats/core/src/html/DFHTML.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "DFHTML.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/html/DFHTML.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFHTML.h b/DocFormats/core/src/html/DFHTML.h
index a4a5bab..abbf320 100644
--- a/DocFormats/core/src/html/DFHTML.h
+++ b/DocFormats/core/src/html/DFHTML.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFHTML_h
#define DocFormats_DFHTML_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/html/DFHTMLNormalization.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFHTMLNormalization.c b/DocFormats/core/src/html/DFHTMLNormalization.c
index 36404a5..2c91043 100644
--- a/DocFormats/core/src/html/DFHTMLNormalization.c
+++ b/DocFormats/core/src/html/DFHTMLNormalization.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFPlatform.h"
#include "DFHTMLNormalization.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/html/DFHTMLNormalization.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFHTMLNormalization.h b/DocFormats/core/src/html/DFHTMLNormalization.h
index b899903..2565fa4 100644
--- a/DocFormats/core/src/html/DFHTMLNormalization.h
+++ b/DocFormats/core/src/html/DFHTMLNormalization.h
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#ifndef DocFormats_DFHTMLNormalization_h
#define DocFormats_DFHTMLNormalization_h
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f9214c47/DocFormats/core/src/html/DFHTMLTables.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFHTMLTables.c b/DocFormats/core/src/html/DFHTMLTables.c
index fa58b2a..5052c75 100644
--- a/DocFormats/core/src/html/DFHTMLTables.c
+++ b/DocFormats/core/src/html/DFHTMLTables.c
@@ -1,16 +1,19 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
#include "DFHTMLTables.h"
#include "DFTable.h"
[25/33] incubator-corinthia git commit:
Posted by ja...@apache.org.
Added build instructions.
X-Virus-Checked: Checked by ClamAV on apache.org
Added build instructions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/c94ae5dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/c94ae5dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/c94ae5dd
Branch: refs/heads/experiment64
Commit: c94ae5dd5503d1c0cd2bd5b843ca117be14c1b89
Parents: 9e8e44c
Author: jani <ja...@apache.org>
Authored: Wed Feb 11 18:17:16 2015 +0100
Committer: jani <ja...@apache.org>
Committed: Wed Feb 11 18:17:16 2015 +0100
----------------------------------------------------------------------
build/build_instructions.txt | Bin 0 -> 7208 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/c94ae5dd/build/build_instructions.txt
----------------------------------------------------------------------
diff --git a/build/build_instructions.txt b/build/build_instructions.txt
new file mode 100644
index 0000000..4bd93b3
Binary files /dev/null and b/build/build_instructions.txt differ