Merge pull request #1 from bibelsammler/variations-typo

Fix HTML export of variations
schierlm · Aug 19, 2015 · aaadf5f · aaadf5f
2 parents c5f9818 + 396eb5e
commit aaadf5f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/biblemulticonverter/src/main/java/biblemulticonverter/format/RoundtripHTML.java b/biblemulticonverter/src/main/java/biblemulticonverter/format/RoundtripHTML.java
@@ -488,8 +488,8 @@ private int parseLine(Visitor<RuntimeException> visitor, String line, int pos, L
 						childVisitor = visitor.visitCSSFormatting(line.substring(pos + 25, endPos - 1));
 					} else if (line.startsWith("<span class=\"fmt-", pos)) {
 						childVisitor = visitor.visitFormattingInstruction(FormattingInstructionKind.valueOf(line.substring(pos + 17, endPos - 1).replace('-', '_').toUpperCase()));
-					} else if (line.startsWith("<span class\"var", pos)) {
-						childVisitor = visitor.visitVariationText(line.substring(pos + 20, endPos - 1).split(" var-"));
+					} else if (line.startsWith("<span class=\"var", pos)) {
+						childVisitor = visitor.visitVariationText(line.substring(pos + 21, endPos - 1).split(" var-"));
 					} else if (line.startsWith("<span class=\"xa xa-", pos)) {
 						String tagContent = line.substring(pos, endPos + 1);
 						Matcher m = Utils.compilePattern("<span class=\"xa xa-([eks])\" style=\"-bmc-xa-([a-z0-9]+)-([a-z0-9-]+): ([A-Za-z0-9-]+);\">").matcher(tagContent);
@@ -600,7 +600,7 @@ public void visitRawHTML(RawHTMLMode mode, String raw) throws IOException {
 
 		@Override
 		public Visitor<IOException> visitVariationText(String[] variations) throws IOException {
-			writer.write("<span class\"var");
+			writer.write("<span class=\"var");
 			for (String var : variations) {
 				writer.write(" var-" + var);
 			}

diff --git a/biblemulticonverter/src/main/resources/RoundtripHTML/style.css b/biblemulticonverter/src/main/resources/RoundtripHTML/style.css
@@ -9,7 +9,7 @@ body { font-family: Arial, sans-serif; font-size: 110%; }
 .biblehtmlcontent .fmt-strike-through { text-decoration: line-through; }
 .biblehtmlcontent .fmt-words-of-jesus { color: red; }
 .biblehtmlcontent .var { display:none; }
-.biblehtmlcontent .var-default { display:block; }
+.biblehtmlcontent .var-default { display:inline; }
 .biblehtmlcontent .xa-s, #biblehtmlcontent  .xa-e { display: none; }
 .biblehtmlcontent .indent { width: 4em; }
 .biblehtmlcontent .gram { font-size: 75%; }