crossrefware (22aug15)

git-svn-id: svn://tug.org/texlive/trunk@38181 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 36 insertions, 7 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/crossrefware/ltx2crossrefxml.pl b/Build/source/texk/texlive/linked_scripts/crossrefware/ltx2crossrefxml.pl
index 5ceee5f13df..5824511cdbf 100755
--- a/Build/source/texk/texlive/linked_scripts/crossrefware/ltx2crossrefxml.pl
+++ b/Build/source/texk/texlive/linked_scripts/crossrefware/ltx2crossrefxml.pl
@@ -56,7 +56,7 @@ Boris Veytsman
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2012  Boris Veytsman
+Copyright (C) 2012-2015  Boris Veytsman
 
 This is free software.  You may redistribute copies of it under the
 terms of the GNU General Public License
@@ -373,7 +373,18 @@ sub SanitizeText {
     $string =~ s/\\doi/DOI: /g;
     $string =~ s/\\\\/ /g;
     $string =~ s/\$//g;
-    $string = decode('latex', $string);
+    # Another bug in decode: it does not understan macrons
+    $string =~ s/\\=(A|\{A\})/##SANITIZE#MACRON##256;/g;
+    $string =~ s/\\=(a|\{a\})/##SANITIZE#MACRON##257;/g;
+    $string =~ s/\\=(E|\{E\})/##SANITIZE#MACRON##274;/g;
+    $string =~ s/\\=(e|\{e\})/##SANITIZE#MACRON##275;/g;
+    $string =~ s/\\=(I|\{I\})/##SANITIZE#MACRON##298;/g;
+    $string =~ s/\\=(i|\{i\})/##SANITIZE#MACRON##299;/g;
+    $string =~ s/\\=(O|\{O\})/##SANITIZE#MACRON##332;/g;
+    $string =~ s/\\=(o|\{o\})/##SANITIZE#MACRON##333;/g;
+    $string =~ s/\\=(U|\{U\})/##SANITIZE#MACRON##362;/g;
+    $string =~ s/\\=(u|\{u\})/##SANITIZE#MACRON##363;/g;
+    $string = decode('latex', $string);    
     $string =~ s/\\[a-zA-Z]+/ /g;
     $string =~ s/\\\\/ /g;
     $string =~ s/[\[\{\}\]]/ /g;
@@ -382,6 +393,7 @@ sub SanitizeText {
     $string =~ s/amp;//g;
     $string =~ s/~/ /g;
     $string =~ s/\s*([\.;,])/$1/g;
+    $string =~ s/##SANITIZE#MACRON##(\d+);/&#$1;/g;
     return $string;
 }
 
diff --git a/Master/texmf-dist/doc/man/man1/ltx2crossrefxml.1 b/Master/texmf-dist/doc/man/man1/ltx2crossrefxml.1
index 983e7b99b8e..9a605700cff 100644
--- a/Master/texmf-dist/doc/man/man1/ltx2crossrefxml.1
+++ b/Master/texmf-dist/doc/man/man1/ltx2crossrefxml.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ltx2crossrefxml 1"
-.TH ltx2crossrefxml 1 "2014-10-18" "" "CROSSREF LIBRARY"
+.TH ltx2crossrefxml 1 "2015-08-18" "" "CROSSREF LIBRARY"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -172,7 +172,7 @@ The configuration file is mostly self-explanatory: it has comments
 Boris Veytsman
 .SH "COPYRIGHT AND LICENSE"
 .IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2012  Boris Veytsman
+Copyright (C) 2012\-2015  Boris Veytsman
 .PP
 This is free software.  You may redistribute copies of it under the
 terms of the \s-1GNU\s0 General Public License
diff --git a/Master/texmf-dist/doc/man/man1/ltx2crossrefxml.man1.pdf b/Master/texmf-dist/doc/man/man1/ltx2crossrefxml.man1.pdf
index 984ddee4c7f..92939671c9c 100644
--- a/Master/texmf-dist/doc/man/man1/ltx2crossrefxml.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/ltx2crossrefxml.man1.pdf
diff --git a/Master/texmf-dist/doc/support/crossrefware/README b/Master/texmf-dist/doc/support/crossrefware/README
index f5d0d13c9d3..276cb5da18d 100644
--- a/Master/texmf-dist/doc/support/crossrefware/README
+++ b/Master/texmf-dist/doc/support/crossrefware/README
@@ -1,5 +1,5 @@
 			 Crossrefware Bundle
-			     version 1.0
+			     version 1.1
 
 
 Scripts useful for working with crossref.org.
@@ -15,3 +15,8 @@ Installation:
 2.  Use *.cfg files as configuration files samples.
 
 3.  Move *.1 to the man pages directory in your system.
+
+
+Changes:
+
+        version 1.1:  workaround for a bug with macrons in TeX::Encode
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/support/crossrefware/crossrefware.pdf b/Master/texmf-dist/doc/support/crossrefware/crossrefware.pdf
index bfc0c19f196..ca4a6b7a44d 100644
--- a/Master/texmf-dist/doc/support/crossrefware/crossrefware.pdf
+++ b/Master/texmf-dist/doc/support/crossrefware/crossrefware.pdf
diff --git a/Master/texmf-dist/scripts/crossrefware/ltx2crossrefxml.pl b/Master/texmf-dist/scripts/crossrefware/ltx2crossrefxml.pl
index 5ceee5f13df..5824511cdbf 100755
--- a/Master/texmf-dist/scripts/crossrefware/ltx2crossrefxml.pl
+++ b/Master/texmf-dist/scripts/crossrefware/ltx2crossrefxml.pl
@@ -56,7 +56,7 @@ Boris Veytsman
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2012  Boris Veytsman
+Copyright (C) 2012-2015  Boris Veytsman
 
 This is free software.  You may redistribute copies of it under the
 terms of the GNU General Public License
@@ -373,7 +373,18 @@ sub SanitizeText {
     $string =~ s/\\doi/DOI: /g;
     $string =~ s/\\\\/ /g;
     $string =~ s/\$//g;
-    $string = decode('latex', $string);
+    # Another bug in decode: it does not understan macrons
+    $string =~ s/\\=(A|\{A\})/##SANITIZE#MACRON##256;/g;
+    $string =~ s/\\=(a|\{a\})/##SANITIZE#MACRON##257;/g;
+    $string =~ s/\\=(E|\{E\})/##SANITIZE#MACRON##274;/g;
+    $string =~ s/\\=(e|\{e\})/##SANITIZE#MACRON##275;/g;
+    $string =~ s/\\=(I|\{I\})/##SANITIZE#MACRON##298;/g;
+    $string =~ s/\\=(i|\{i\})/##SANITIZE#MACRON##299;/g;
+    $string =~ s/\\=(O|\{O\})/##SANITIZE#MACRON##332;/g;
+    $string =~ s/\\=(o|\{o\})/##SANITIZE#MACRON##333;/g;
+    $string =~ s/\\=(U|\{U\})/##SANITIZE#MACRON##362;/g;
+    $string =~ s/\\=(u|\{u\})/##SANITIZE#MACRON##363;/g;
+    $string = decode('latex', $string);    
     $string =~ s/\\[a-zA-Z]+/ /g;
     $string =~ s/\\\\/ /g;
     $string =~ s/[\[\{\}\]]/ /g;
@@ -382,6 +393,7 @@ sub SanitizeText {
     $string =~ s/amp;//g;
     $string =~ s/~/ /g;
     $string =~ s/\s*([\.;,])/$1/g;
+    $string =~ s/##SANITIZE#MACRON##(\d+);/&#$1;/g;
     return $string;
 }