You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@corinthia.apache.org by pm...@apache.org on 2014/12/19 09:25:39 UTC

[1/5] incubator-corinthia git commit: :tada: Added .gitattributes

Repository: incubator-corinthia
Updated Branches:
  refs/heads/stable d1aca0ca8 -> 76d9bc38e


:tada: Added .gitattributes


Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/94131e96
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/94131e96
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/94131e96

Branch: refs/heads/stable
Commit: 94131e96e75936d335b28ced57353f090be46a1b
Parents: d1aca0c
Author: Dennis Hamilton <or...@apache.org>
Authored: Wed Dec 17 08:01:19 2014 -0800
Committer: Dennis Hamilton <or...@apache.org>
Committed: Wed Dec 17 08:01:19 2014 -0800

----------------------------------------------------------------------
 .gitattributes | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/94131e96/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..412eeda
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain


[3/5] incubator-corinthia git commit: DO NOT USE MASTER BRANCH

Posted by pm...@apache.org.
DO NOT USE MASTER BRANCH

This version of the README.md is on the master branch as a warning.  Do
not merge this branch to static or develop and do not merge anything to
the master branch.  It is not used by the Corinthia project at this
time.


Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/0e89d379
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/0e89d379
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/0e89d379

Branch: refs/heads/stable
Commit: 0e89d37969a133145ca8a59c18f3c4e3d9ea5624
Parents: 6898b0a
Author: Dennis Hamilton <or...@apache.org>
Authored: Wed Dec 17 12:44:10 2014 -0800
Committer: Dennis Hamilton <or...@apache.org>
Committed: Wed Dec 17 12:44:10 2014 -0800

----------------------------------------------------------------------
 README.md | 79 +++++-----------------------------------------------------
 1 file changed, 6 insertions(+), 73 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/0e89d379/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 28519a0..8e27182 100644
--- a/README.md
+++ b/README.md
@@ -1,80 +1,13 @@
-# About Corinthia
+# DO NOT USE THIS MASTER BRANCH
 
-Corinthia is a library for converting between different word processing file
-formats. Currently it supports .docx (part of the OOXML specification), HTML,
-and LaTeX (export-only). Corinthia also contain convinience executables.
+The Master Branch of the Corinthia Repository is not used.  It is required for administrative purposes.
 
-We are putting together a proposal to make this an Apache Incubator project. [See here for details](https://github.com/uxproductivity/Corinthia/wiki/Incubator-proposal#abstract)
+The main branches to emply are "static" which is clean and "develop" which is not always clean.
 
-For more information, contact any of the following people
+## DO NOT PUT WORK ON THE MASTER BRANCH.
 
-- Peter Kelly <pe...@uxproductivity.com>
-- Louis Suárez-Potts <lu...@gmail.com>
-- Jan Iverson <ja...@apache.org>
+## DO NOT MERGE THE MASTER BRANCH.
 
-Please note that the documentation for this project is in a very preliminary stage. We'll be improving this in due course; feel free to contact us with any questions.
+If you have cloned this repository and you are seeing this file, please checkout either static or develop to see the active work on the Apache Corinthia Incubator project.
 
-# License
 
-Corinthia is licensed under the Apache License version 2.0; see
-LICENSE.txt for details.
-
-# What the library can do
-
-1. Create new HTML files from a .docx source
-2. Create new .docx files from a HTML source
-3. Update existing .docx files based on a modified HTML file produced in (1)
-4. Convert .docx or HTML files to LaTeX
-5. Provide access to document structure, in terms of a DOM-like API for
-   manipulating XML trees, and an object model for working with CSS stylesheets
-
-# Components
-
-There are three major components, in their respective directories:
-
-* `DocFormats` - the library itself
-* `dfutil` - a driver program used for running [...]
-* automated tests (located in the tests directory)
-
-Run dfutil without any command-line arguments to see a list of operations. Here
-is an example of converting a .docx file to HTML, modifying it, and then updating
-the original .docx. Note that it is important, due to how internal mapping works,
-that the .docx file being written is the same file as the original; using a new
-file won't work.
-
-    dfutil filename.docx filename.html
-    vi filename.html # Make some changes
-    dfutil filename.html filename.docx
-
-If you examine the convertFile function in `dfutil/Commands.c`, you will see the
-main entry points to perform these conversions, which you can call from your own
-program.
-
-# Current Status
-DocFormats has been shipping as part of UX Write on the iOS app store since
-February 2013.
-
-[detailed status](https://github.com/uxproductivity/Corinthia/wiki/Incubator-proposal#current-status)
-
-# Platforms and dependencies
-
-Corinthia builds and runs on iOS, OS X, and Linux. Windows support is in the works.
-
-To build DocFormats, you will need to have the following installed:
-
-* [CMake](http://www.cmake.org)
-* [libxml2](http://xmlsoft.org)
-* [libiconv](https://www.gnu.org/software/libiconv/)
-* [zlib](http://www.zlib.net)
-
-# Build instructions
-
-Corinthia currently build on Linux and OS X (mac).
-
-For detailed instructions, please see
-
-[build instructions](https://github.com/uxproductivity/Corinthia/wiki/Build-instructions)
-
-# Further information
-
-please see [mail list](https://github.com/uxproductivity/Corinthia/wiki/Talk-to-us) for contacts


[4/5] incubator-corinthia git commit: Revert "DO NOT USE MASTER BRANCH"

Posted by pm...@apache.org.
Revert "DO NOT USE MASTER BRANCH"

This reverts commit 0e89d37969a133145ca8a59c18f3c4e3d9ea5624.


Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/4d3a7c20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/4d3a7c20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/4d3a7c20

Branch: refs/heads/stable
Commit: 4d3a7c20981adceab842dc080d8c26a168f2b625
Parents: 0e89d37
Author: Dennis Hamilton <or...@apache.org>
Authored: Wed Dec 17 18:15:17 2014 -0800
Committer: Dennis Hamilton <or...@apache.org>
Committed: Wed Dec 17 18:15:17 2014 -0800

----------------------------------------------------------------------
 README.md | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 73 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/4d3a7c20/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 8e27182..28519a0 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,80 @@
-# DO NOT USE THIS MASTER BRANCH
+# About Corinthia
 
-The Master Branch of the Corinthia Repository is not used.  It is required for administrative purposes.
+Corinthia is a library for converting between different word processing file
+formats. Currently it supports .docx (part of the OOXML specification), HTML,
+and LaTeX (export-only). Corinthia also contain convinience executables.
 
-The main branches to emply are "static" which is clean and "develop" which is not always clean.
+We are putting together a proposal to make this an Apache Incubator project. [See here for details](https://github.com/uxproductivity/Corinthia/wiki/Incubator-proposal#abstract)
 
-## DO NOT PUT WORK ON THE MASTER BRANCH.
+For more information, contact any of the following people
 
-## DO NOT MERGE THE MASTER BRANCH.
+- Peter Kelly <pe...@uxproductivity.com>
+- Louis Suárez-Potts <lu...@gmail.com>
+- Jan Iverson <ja...@apache.org>
 
-If you have cloned this repository and you are seeing this file, please checkout either static or develop to see the active work on the Apache Corinthia Incubator project.
+Please note that the documentation for this project is in a very preliminary stage. We'll be improving this in due course; feel free to contact us with any questions.
 
+# License
 
+Corinthia is licensed under the Apache License version 2.0; see
+LICENSE.txt for details.
+
+# What the library can do
+
+1. Create new HTML files from a .docx source
+2. Create new .docx files from a HTML source
+3. Update existing .docx files based on a modified HTML file produced in (1)
+4. Convert .docx or HTML files to LaTeX
+5. Provide access to document structure, in terms of a DOM-like API for
+   manipulating XML trees, and an object model for working with CSS stylesheets
+
+# Components
+
+There are three major components, in their respective directories:
+
+* `DocFormats` - the library itself
+* `dfutil` - a driver program used for running [...]
+* automated tests (located in the tests directory)
+
+Run dfutil without any command-line arguments to see a list of operations. Here
+is an example of converting a .docx file to HTML, modifying it, and then updating
+the original .docx. Note that it is important, due to how internal mapping works,
+that the .docx file being written is the same file as the original; using a new
+file won't work.
+
+    dfutil filename.docx filename.html
+    vi filename.html # Make some changes
+    dfutil filename.html filename.docx
+
+If you examine the convertFile function in `dfutil/Commands.c`, you will see the
+main entry points to perform these conversions, which you can call from your own
+program.
+
+# Current Status
+DocFormats has been shipping as part of UX Write on the iOS app store since
+February 2013.
+
+[detailed status](https://github.com/uxproductivity/Corinthia/wiki/Incubator-proposal#current-status)
+
+# Platforms and dependencies
+
+Corinthia builds and runs on iOS, OS X, and Linux. Windows support is in the works.
+
+To build DocFormats, you will need to have the following installed:
+
+* [CMake](http://www.cmake.org)
+* [libxml2](http://xmlsoft.org)
+* [libiconv](https://www.gnu.org/software/libiconv/)
+* [zlib](http://www.zlib.net)
+
+# Build instructions
+
+Corinthia currently build on Linux and OS X (mac).
+
+For detailed instructions, please see
+
+[build instructions](https://github.com/uxproductivity/Corinthia/wiki/Build-instructions)
+
+# Further information
+
+please see [mail list](https://github.com/uxproductivity/Corinthia/wiki/Talk-to-us) for contacts


[2/5] incubator-corinthia git commit: Revert ":tada: Added .gitattributes"

Posted by pm...@apache.org.
Revert ":tada: Added .gitattributes"

This reverts commit 94131e96e75936d335b28ced57353f090be46a1b.


Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/6898b0ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/6898b0ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/6898b0ad

Branch: refs/heads/stable
Commit: 6898b0ad8fe838be6428b599c30c73bc13432331
Parents: 94131e9
Author: Dennis Hamilton <or...@apache.org>
Authored: Wed Dec 17 08:01:50 2014 -0800
Committer: Dennis Hamilton <or...@apache.org>
Committed: Wed Dec 17 08:01:50 2014 -0800

----------------------------------------------------------------------
 .gitattributes | 22 ----------------------
 1 file changed, 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/6898b0ad/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 412eeda..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1,22 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-
-# Custom for Visual Studio
-*.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
-
-# Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain


[5/5] incubator-corinthia git commit: README.md Transposed for Apache Incubator

Posted by pm...@apache.org.
README.md Transposed for Apache Incubator

The README.md is updated to reflect this repository being part of the
Apache Corinthia (incubating) project.


Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/76d9bc38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/76d9bc38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/76d9bc38

Branch: refs/heads/stable
Commit: 76d9bc38e287748d06179c1c7bc36ad5108e59c6
Parents: 4d3a7c2
Author: Dennis Hamilton <or...@apache.org>
Authored: Thu Dec 18 11:36:09 2014 -0800
Committer: Dennis Hamilton <or...@apache.org>
Committed: Thu Dec 18 11:36:09 2014 -0800

----------------------------------------------------------------------
 README.md | 80 +++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 49 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/76d9bc38/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 28519a0..16d889b 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,38 @@
-# About Corinthia
+# About Apache Corinthia (incubating)
 
-Corinthia is a library for converting between different word processing file
-formats. Currently it supports .docx (part of the OOXML specification), HTML,
-and LaTeX (export-only). Corinthia also contain convinience executables.
+Corinthia is a library for converting between different word-processing file
+formats. Initially, it supports .docx (part of the OOXML specification), HTML,
+and LaTeX (export-only). The Corinthia project also provides convenience
+executables.  The library has shipped as part of
+[UX Write](http://www.uxproductivity.com/) since February 2013.
 
-We are putting together a proposal to make this an Apache Incubator project. [See here for details](https://github.com/uxproductivity/Corinthia/wiki/Incubator-proposal#abstract)
+On December 8, 2014, Corinthia entered the Apache Software
+Foundation
+[incubator](http://incubator.apache.org/incubation/Process_Description.html).
+The
+[accepted proposal](http://wiki.apache.org/incubator/CorinthiaProposal) and
+[incubation status](http://incubator.apache.org/projects/corinthia.html)
+provide incubation background and progress information.
 
-For more information, contact any of the following people
+The communication hub of the project is the development mailing list,
 
-- Peter Kelly <pe...@uxproductivity.com>
-- Louis Suárez-Potts <lu...@gmail.com>
-- Jan Iverson <ja...@apache.org>
+    dev @ corinthia.incubator.apache.org
 
-Please note that the documentation for this project is in a very preliminary stage. We'll be improving this in due course; feel free to contact us with any questions.
+To receive list postings and interact on the list, simply send a message to
+
+   dev-subscribe @ corinthia.incubator.apache.org
+
+from the email address to receive list messages at.  The reply from
+the list robot to that address provides confirmation instructions and
+information on managing the subscription.
+
+There is a [Corinthia incubator web
+site](http://corinthia.incubator.apache.org/) and there will be a project
+wiki and JIRA issue tracker.
+
+The sites and documentation for this project are at a preliminary
+stage. Content will be moved to Apache and improved as incubation moves
+ahead.
 
 # License
 
@@ -26,7 +46,8 @@ LICENSE.txt for details.
 3. Update existing .docx files based on a modified HTML file produced in (1)
 4. Convert .docx or HTML files to LaTeX
 5. Provide access to document structure, in terms of a DOM-like API for
-   manipulating XML trees, and an object model for working with CSS stylesheets
+   manipulating XML trees, and an object model for working with CSS
+   stylesheets
 
 # Components
 
@@ -36,29 +57,24 @@ There are three major components, in their respective directories:
 * `dfutil` - a driver program used for running [...]
 * automated tests (located in the tests directory)
 
-Run dfutil without any command-line arguments to see a list of operations. Here
-is an example of converting a .docx file to HTML, modifying it, and then updating
-the original .docx. Note that it is important, due to how internal mapping works,
-that the .docx file being written is the same file as the original; using a new
-file won't work.
+Run dfutil without any command-line arguments to see a list of operations.
+Here is an example of converting a .docx file to HTML, modifying it, and then
+updating the original .docx. Note that it is important, due to how internal
+mapping works, that the .docx file being written is the same file as the
+original; using a new file won't work.
 
     dfutil filename.docx filename.html
     vi filename.html # Make some changes
     dfutil filename.html filename.docx
 
-If you examine the convertFile function in `dfutil/Commands.c`, you will see the
-main entry points to perform these conversions, which you can call from your own
-program.
-
-# Current Status
-DocFormats has been shipping as part of UX Write on the iOS app store since
-February 2013.
-
-[detailed status](https://github.com/uxproductivity/Corinthia/wiki/Incubator-proposal#current-status)
+If you examine the convertFile function in `dfutil/Commands.c`, you will see
+the main entry points to perform these conversions, which you can call from
+your own program.
 
 # Platforms and dependencies
 
-Corinthia builds and runs on iOS, OS X, and Linux. Windows support is in the works.
+Corinthia builds and runs on iOS, OS X, and Linux. Windows support is in the
+works.
 
 To build DocFormats, you will need to have the following installed:
 
@@ -69,12 +85,14 @@ To build DocFormats, you will need to have the following installed:
 
 # Build instructions
 
-Corinthia currently build on Linux and OS X (mac).
+Corinthia currently builds on Linux and OS X (mac). See the [build  instructions](https://github.com/uxproductivity/Corinthia/wiki/Build-instructions).
+
+# Contributing
 
-For detailed instructions, please see
+Contributors are welcome and prized.  Details on how to participate on the
+project will be posted soon.
 
-[build instructions](https://github.com/uxproductivity/Corinthia/wiki/Build-instructions)
+Meanwhile, the easiest way to contribute is by subscribing to the development
+list and asking your questions and offering suggestions there.
 
-# Further information
 
-please see [mail list](https://github.com/uxproductivity/Corinthia/wiki/Talk-to-us) for contacts