Merge branch 'master' into mhameed_runharness_compact_output

HACKING

@@ -3,10 +3,10 @@ This HACKING file describes the development environment.  	-*- org -*-
   Copyright (C) 2008, 2009, 2011 ViewPlus Technologies, Inc. and Abilitiessoft, Inc.
   Copyright (C) 2012, 2013, 2014 Swiss Library for the Blind, Visually Impaired and Print Disabled 
 
-
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
-  notice and this notice are preserved.
+  notice and this notice are preserved. This file is offered as-is,
+  without any warranty.
 
 This file attempts to describe the maintainer-specific notes to follow
 when hacking liblouis. 

NEWS

@@ -1,8 +1,12 @@
 liblouis NEWS -- history of user-visible changes.  	-*- org -*-
 
-* Noteworthy changes in release 2.?.?
+* Noteworthy changes in release 2.6.1 (2014-12-1)
 ** Braille table improvements
-- Updates and correction to Hungarian braille tables, thanks to Hammer Attila.
+- Updates and correction to Hungarian braille tables, thanks to Hammer
+  Attila.
+
+** Other changes
+- When compiling with mingw or cygwin resulting dll is liblouis.dll.
 
 * Noteworthy changes in release 2.6.0 (2014-9-1)
 This is the first release by the new maintainer team. A lot of work by

configure.ac

@@ -114,6 +114,7 @@ AM_CONDITIONAL([HAVE_UCS4], [test x$enable_ucs4 = xyes])
 case $host in
   *mingw* | *cygwin*)
     CFLAGS="$CFLAGS -Wl,--add-stdcall-alias"
+    LDFLAGS="$LDFLAGS -avoid-version"
   ;;
 esac
 

contrib/braille-input.el

@@ -1,3 +1,25 @@
+;;; braille-input.el --- A simple input method for braille
+
+;; Copyright (C) 2013 Swiss Library for the Blind, Visually Impaired and Print Disabled 
+
+;; This file is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published
+;; by the Free Software Foundation, either version 3 of the License,
+;; or (at your option) any later version.
+
+;; This file is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+
+;;; Code:
+
 ;; This code is inspired by Vim unicode braille () and http://benizi.com/vim/braille.vim
 
 (robin-define-package "braille-numerical"

contrib/liblouis.el

@@ -2,22 +2,18 @@
 
 ;; Copyright (C) 2009, 2011 Christian Egli
 
-;; This file is not part of GNU Emacs.
+;; This file is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published
+;; by the Free Software Foundation, either version 3 of the License,
+;; or (at your option) any later version.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
+;; This file is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 

python/examples/dtbook2brldtbook.xsl

@@ -1,5 +1,14 @@
 <?xml version='1.0'?>
 
+<!-- liblouis Braille Translation and Back-Translation Library -->
+
+<!-- Copyright (C) 2010 Swiss Library for the Blind, Visually Impaired and Print Disabled -->
+
+<!-- Copying and distribution of this file, with or without modification, -->
+<!-- are permitted in any medium without royalty provided the copyright -->
+<!-- notice and this notice are preserved. This file is offered as-is, -->
+<!-- without any warranty. -->
+
 <xsl:stylesheet 
    version='1.0'
    xmlns:xsl='http://www.w3.org/1999/XSL/Transform'

python/examples/liblouisxslt.py

@@ -1,5 +1,14 @@
 #! /usr/bin/python -u
 #
+# liblouis Braille Translation and Back-Translation Library
+
+# Copyright (C) 2010 Swiss Library for the Blind, Visually Impaired and Print Disabled
+
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved. This file is offered as-is,
+# without any warranty.
+
 # This is a very simple example on how to extend libxslt to be able to
 # invoke liblouis from xslt. See also the accompanying
 # dtbook2brldtbook.xsl in the same directory which simpy copies a dtbook

tables/Makefile.am

@@ -13,12 +13,10 @@ table_files = \
 	bo.ctb \
 	boxes.ctb \
 	braille-patterns.cti \
-	braille-patternsin.cti \
 	br-in-g1.utb \
 	ca-chardefs.cti \
 	ca-g1.ctb \
 	chardefs.cti \
-	chardefsin.cti \
 	chr-us-g1.ctb \
 	ckb-chardefs.cti \
 	ckb-g1.ctb \
@@ -162,11 +160,8 @@ table_files = \
 	kru.ctb \
 	ks-in-g1.utb \
 	latinLetterDef6Dots.uti \
-	latinLetterDef8Dotsin.uti \
 	latinLetterDef8Dots.uti \
-	litdigits6Dotsin.uti \
 	litdigits6Dots.uti \
-	loweredDigits6Dotsin.uti \
 	loweredDigits6Dots.uti \
 	loweredDigits8Dots.uti \
 	lt.ctb \

tables/bengali.cti

@@ -23,7 +23,7 @@
 # Last updated on May 5, 2014
 # To report any bugs or any suggestion, please write to d@saksham.org and sreeja.param@gmail.com
 
-include braille-patternsin.cti
+include braille-patterns.cti
 
 letter   \x0981	3	# Bengali Sign Candrabindu
 letter   \x0982	56	# Bengali Sign Anusvara