[liblouis-liblouisxml] [liblouisutdml] 2 new revisions pushed by christia...@xxxxxxxxx on 2014-06-19 07:22 GMT
- From: liblouisutdml@xxxxxxxxxxxxxx
- To: liblouis-liblouisxml@xxxxxxxxxxxxx
- Date: Thu, 19 Jun 2014 07:22:15 +0000
2 new revisions:
Revision: e32b17607674
Branch: default
Author: Christian Egli <christian.egli@xxxxxxxxxxxxxx>
Date: Thu Jun 19 07:19:30 2014 UTC
Log: Building of sem_names.h is now integrated in the build process...
http://code.google.com/p/liblouisutdml/source/detail?r=e32b17607674
Revision: d0e531b12fb1
Branch: default
Author: Christian Egli <christian.egli@xxxxxxxxxxxxxx>
Date: Thu Jun 19 07:20:16 2014 UTC
Log: Depend on liblouis 2.6.0
http://code.google.com/p/liblouisutdml/source/detail?r=d0e531b12fb1
==============================================================================
Revision: e32b17607674
Branch: default
Author: Christian Egli <christian.egli@xxxxxxxxxxxxxx>
Date: Thu Jun 19 07:19:30 2014 UTC
Log: Building of sem_names.h is now integrated in the build process
There is a Perl script which is invoked from Makefile.am as desribed
in section 'Built Sources' in the Automake manual.
http://code.google.com/p/liblouisutdml/source/detail?r=e32b17607674
Added:
/liblouisutdml/make_sem_names.pl
Deleted:
/liblouisutdml/Makesemnames
/liblouisutdml/README
/liblouisutdml/make_sem_names
/liblouisutdml/make_sem_names.c
/liblouisutdml/sem_names.h
Modified:
/.hgignore
/liblouisutdml/Makefile.am
=======================================
--- /dev/null
+++ /liblouisutdml/make_sem_names.pl Thu Jun 19 07:19:30 2014 UTC
@@ -0,0 +1,25 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+
+my $start = 0;
+
+print "/* Do not edit this file. It is automatically generated by ", $0, "
*/\n";
+print "#ifndef __SEM_NAMES_h\n";
+print "#define __SEM_NAMES_h\n";
+print "static const char *semNames[] = {\n";
+
+while (<>) {
+ # only look at the lines between the curly brackets
+ if (/{/ .. /}/) {
+ chomp;
+ next if /[{}]/; # ignore the lines with curly brackets
+ next if /^\s*\/\*/; # ignore comments
+ s/^\s+([A-Za-z0-9_]+).*/$1/g; # extract the name
+ print " \"", $_, "\",\n";
+ }
+}
+
+print "NULL\n";
+print "};\n";
+print "#endif /*__SEM_NAMES_H*/\n";
=======================================
--- /liblouisutdml/Makesemnames Sat Jul 3 16:32:58 2010 UTC
+++ /dev/null
@@ -1,7 +0,0 @@
-# If you change sem_enum.h run this file with
-# make -f Makesemnames
-
-sem_names.h : sem_enum.h make_sem_names
- ./make_sem_names
-make_sem_names : make_sem_names.c
- gcc -O2 -Wall -o make_sem_names make_sem_names.c
=======================================
--- /liblouisutdml/README Sat Jul 3 16:32:58 2010 UTC
+++ /dev/null
@@ -1,3 +0,0 @@
-If you change sem_enum.h be sure to run
-make -f Makesemnames
-
=======================================
--- /liblouisutdml/make_sem_names Tue Aug 31 22:51:30 2010 UTC
+++ /dev/null
Binary file, no diff available.
=======================================
--- /liblouisutdml/make_sem_names.c Sat Jul 3 16:32:58 2010 UTC
+++ /dev/null
@@ -1,86 +0,0 @@
-/* liblouisutdml Braille Transcription Library
-
- This file may contain code borrowed from the Linux screenreader
- BRLTTY, copyright (C) 1999-2006 by
- the BRLTTY Team
-
- Copyright (C) 2004, 2005, 2006
- ViewPlus Technologies, Inc. www.viewplus.com
- and
- JJB Software, Inc. www.jjb-software.com
- All rights reserved
-
- This file is free software; you can redistribute it and/or modify it
- under the terms of the Lesser or Library GNU General Public License
- as published by the
- Free Software Foundation; either version 3, 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
- Library GNU General Public License for more details.
-
- You should have received a copy of the Library GNU General Public
- License along with this program; see the file COPYING. If not, write to
- the Free Software Foundation, 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
- Maintained by John J. Boyer john.boyer@xxxxxxxxxxxxxxxx
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-int
-main (void)
-{
- FILE *semIn;
- FILE *semOut;
- char inbuf[128];
- char *curchar;
- int ch;
- int ignoreLine = 1;
- char *name;
- int nameLength;
- if ((semIn = fopen ("sem_enum.h", "r")) == NULL)
- {
- fprintf (stderr, "Cannot open sem_enum.h file.\n");
- exit (1);
- }
- if ((semOut = fopen ("sem_names.h", "w")) == NULL)
- {
- fprintf (stderr, "Cannot open sem_names.h file.\n");
- exit (1);
- }
- fprintf (semOut, "#ifndef __SEM_NAMES_h\n");
- fprintf (semOut, "#define __SEM_NAMES_h\n");
- fprintf (semOut, "static const char *semNames[] = {\n");
- while ((fgets (inbuf, sizeof (inbuf), semIn)))
- {
- curchar = inbuf;
- while ((ch = *curchar++) <= 32 && ch != 0);
- if (ch == '/')
-continue;
- if (ignoreLine)
- {
- if (ch == '{')
- ignoreLine = 0;
- continue;
- }
- if (ch == '}')
- break;
- name = curchar - 1;
- while ((ch = *curchar++) > 32 && ch != ',' && ch != '=');
- nameLength = curchar - name - 1;
- name[nameLength] = 0;
- fprintf (semOut, " \"%s\",\n", name);
- }
- fclose (semIn);
- fprintf (semOut, "NULL\n");
- fprintf (semOut, "};\n");
- fprintf (semOut, "#endif /*__SEM_NAMES_H*/\n");
- fclose (semOut);
- return 0;
-}
=======================================
--- /liblouisutdml/sem_names.h Wed Jun 18 09:23:57 2014 UTC
+++ /dev/null
@@ -1,107 +0,0 @@
-#ifndef __SEM_NAMES_h
-#define __SEM_NAMES_h
-static const char *semNames[] = {
- "no",
- "skip",
- "generic",
- "cdata",
- "htmllink",
- "htmltarget",
- "changetable",
- "reverse",
- "configfile",
- "configstring",
- "configtweak",
- "document",
- "para",
- "heading1",
- "heading2",
- "heading3",
- "heading4",
- "heading5",
- "heading6",
- "heading7",
- "heading8",
- "heading9",
- "heading10",
- "contentsheader",
- "contents1",
- "contents2",
- "contents3",
- "contents4",
- "contents5",
- "contents6",
- "contents7",
- "contents8",
- "contents9",
- "contents10",
- "notranslate",
- "compbrl",
- "uncontracted",
- "contracted",
- "pagenum",
- "genpurp1",
- "genpurp2",
- "pagebreak",
- "attrtotext",
- "runninghead",
- "footer",
- "italicx",
- "boldx",
- "underlinex",
- "linespacing",
- "blankline",
- "softreturn",
- "newpage",
- "righthandpage",
- "code",
- "music",
- "math",
- "mi",
- "mn",
- "mo",
- "mtext",
- "mspace",
- "ms",
- "mglyph",
- "mrow",
- "mfrac",
- "msqrt",
- "mroot",
- "mstyle",
- "merror",
- "mpadded",
- "mphantom",
- "mfenced",
- "menclose",
- "msub",
- "msup",
- "msubsup",
- "munder",
- "mover",
- "munderover",
- "mmultiscripts",
- "none",
- "semantics",
- "mprescripts",
- "mtable",
- "mtr",
- "mtd",
- "maligngroup",
- "malignmark",
- "mlabeledtr",
- "maction",
- "chemistry",
- "graphic",
- "markhead",
- "utdmeta",
- "utdbrl",
- "utdnewpage",
- "utdnewline",
- "utdbrlonly",
- "utddispimg",
- "utdinlnimg",
- "end_all",
-NULL
-};
-#endif /*__SEM_NAMES_H*/
=======================================
--- /.hgignore Thu Apr 17 06:43:35 2014 UTC
+++ /.hgignore Thu Jun 19 07:19:30 2014 UTC
@@ -55,6 +55,7 @@
liblouisutdml/config.h
liblouisutdml/config.h.in
liblouisutdml/stamp-h1
+liblouisutdml/sem_names.h
liblouisutdml-*.tar.gz
=======================================
--- /liblouisutdml/Makefile.am Mon May 26 08:51:33 2014 UTC
+++ /liblouisutdml/Makefile.am Thu Jun 19 07:19:30 2014 UTC
@@ -57,8 +57,9 @@
liblouisutdml_la_SOURCES += ../java/Jliblouisutdml.c
endif
-EXTRA_DIST = \
- README \
- make_sem_names.c \
- Makesemnames
+# Make sure sem_names.h is generated before everything else
+EXTRA_DIST = make_sem_names.pl
+BUILT_SOURCES = sem_names.h
+sem_names.h: sem_enum.h Makefile
+ $(srcdir)/make_sem_names.pl < $< > $@
==============================================================================
Revision: d0e531b12fb1
Branch: default
Author: Christian Egli <christian.egli@xxxxxxxxxxxxxx>
Date: Thu Jun 19 07:20:16 2014 UTC
Log: Depend on liblouis 2.6.0
http://code.google.com/p/liblouisutdml/source/detail?r=d0e531b12fb1
Modified:
/configure.ac
=======================================
--- /configure.ac Wed Apr 2 12:58:05 2014 UTC
+++ /configure.ac Thu Jun 19 07:20:16 2014 UTC
@@ -51,7 +51,7 @@
AC_PATH_PROG(PKG_CONFIG, pkg-config)
-PKG_CHECK_MODULES(BASE_DEPENDENCIES, [liblouis >= 2.5.1, libxml-2.0])
+PKG_CHECK_MODULES(BASE_DEPENDENCIES, [liblouis >= 2.6.0, libxml-2.0])
# Checks for libraries.
For a description of the software, to download it and links to
project pages go to http://www.abilitiessoft.com
Other related posts:
- » [liblouis-liblouisxml] [liblouisutdml] 2 new revisions pushed by christia...@xxxxxxxxx on 2014-06-19 07:22 GMT - liblouisutdml
