Skip to content

Commit

Permalink
More URI adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
thvitt committed Apr 8, 2018
1 parent 65d96d0 commit bb79fc8
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion pom.xml
Expand Up @@ -112,7 +112,8 @@
<dependency>
<groupId>com.xmlcalabash</groupId>
<artifactId>xmlcalabash</artifactId>
<version>1.1.13-96</version>
<!--version>1.1.13-96</version-->
<version>1.1.20-98</version>
</dependency>

</dependencies>
Expand Down
Expand Up @@ -207,7 +207,7 @@ public Stream<TranscriptPage> transcripts() {
try {
final XMLTag doc = XMLDoc.from(path.toFile()).deletePrefixes();
sigil = doc.gotoTag("//idno[@type='faustedition']").getText();
basename = sigil.replaceAll("\\s+", "_"); // sigil.replace("α", "alpha").replaceAll("[^A-Za-z0-9.-]+", "_");
basename = sigil.replaceAll("α", "alpha").replaceAll("[^A-Za-z0-9.-]", "_");
base = URI.create(doc.gotoTag("//*[@base]").getAttribute("base"));
final Builder<TranscriptPage> builder = Stream.builder();
doc.forEach(tag -> builder.accept(new TranscriptPage(this, tag.getAttribute("uri"), tag.rawXpathNumber("count(preceding::page)").intValue()+1)),
Expand Down
2 changes: 1 addition & 1 deletion src/main/xproc-config/config.xml
Expand Up @@ -20,7 +20,7 @@
<c:param name="variants" value="${project.build.directory}/www/print/variants/"/>

<!-- URL prefix to be used for links into the document viewer (transcripts etc.) -->
<c:param name="docbase" value="/documentViewer?faustUri=faust://xml"/>
<c:param name="docbase" value="/document?sigil="/>

<!-- URL prefix to be used for links into the print and lesetext folder -->
<c:param name="printbase" value="/print/"/>
Expand Down

0 comments on commit bb79fc8

Please sign in to comment.