Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docbook exporter #4108

Closed
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' of https://github.com/JabRef/jabref into docboo…
…k-exporter
  • Loading branch information
johannes-manner committed Jun 6, 2018
commit 152cf52c5edb97b3fc2343f6cc3a7a193c8ab2ea
18 changes: 7 additions & 11 deletions src/main/java/org/jabref/JabRefMain.java
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,13 @@ private static void start(String[] args) {

applyPreferences(preferences);

FallbackExceptionHandler.installExceptionHandler();

ensureCorrectJavaVersion();
// Process arguments
ArgumentProcessor argumentProcessor = new ArgumentProcessor(args, ArgumentProcessor.Mode.INITIAL_START);

ProxyPreferences proxyPreferences = preferences.getProxyPreferences();
ProxyRegisterer.register(proxyPreferences);
if (proxyPreferences.isUseProxy() && proxyPreferences.isUseAuthentication()) {
Authenticator.setDefault(new ProxyAuthenticator());
// Check for running JabRef
if (!handleMultipleAppInstances(args) || argumentProcessor.shouldShutDown()) {
shutdownCurrentInstance();
return;
}

// If not, start GUI
Expand Down Expand Up @@ -173,9 +172,6 @@ private static void applyPreferences(JabRefPreferences preferences) {
preferences.loadCustomEntryTypes(BibDatabaseMode.BIBLATEX));
Globals.exportFactory = Globals.prefs.getExporterFactory(Globals.journalAbbreviationLoader);

// Process arguments
ArgumentProcessor argumentProcessor = new ArgumentProcessor(args, ArgumentProcessor.Mode.INITIAL_START);

// Initialize protected terms loader
Globals.protectedTermsLoader = new ProtectedTermsLoader(Globals.prefs.getProtectedTermsPreferences());

Expand All @@ -190,4 +186,4 @@ private static void configureProxy(ProxyPreferences proxyPreferences) {
Authenticator.setDefault(new ProxyAuthenticator());
}
}
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please keep the newline at the end of the file. Just unstage this file from the commit.

3 changes: 3 additions & 0 deletions src/main/java/org/jabref/logic/layout/LayoutEntry.java
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,9 @@ private String handleOptionField(BibEntry bibtex, BibDatabase database) {
}

if (option != null) {
// remove all LaTeX commands before other formatters are changing the text
RemoveLatexCommandsFormatter rm = new RemoveLatexCommandsFormatter();
fieldEntry = rm.format(fieldEntry);
for (LayoutFormatter anOption : option) {
fieldEntry = anOption.format(fieldEntry);
}
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.