mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Add support for second-field-align to HTML mode

Browse source
This commit is contained in:
Dan Stillman 2010-11-27 00:03:25 +00:00
parent de1df45444
commit a50167ac40
1 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

41
chrome/content/zotero/xpcom/cite.js
View file

@ -279,25 +279,29 @@ Zotero.Cite.makeFormattedBibliography = function(cslEngine, format) {
if(entrySpacing == NaN) throw "Invalid entryspacing"; if(entrySpacing == NaN) throw "Invalid entryspacing";
if(lineSpacing == NaN) throw "Invalid linespacing"; if(lineSpacing == NaN) throw "Invalid linespacing";
// Force a minimum line height
if(lineSpacing <= 1.35) lineSpacing = 1.35;
default xml namespace = ''; default xml namespace = '';
XML.prettyPrinting = false; XML.prettyPrinting = false;
XML.ignoreWhitespace = false; XML.ignoreWhitespace = false;
var xml = new XML(html); var xml = new XML(html);
// TODO: second-field-align var multiField = !!xml..div.(@class == "csl-left-margin").length();
// div.csl-bib-body // One of the characters is usually a period, so we can adjust this down a bit
//xml.@style = "padding-top: 0.5em; padding-bottom: 0.5em;"; maxOffset = Math.max(1, maxOffset - 2);
// Force a minimum line height
if(lineSpacing <= 1.35) lineSpacing = 1.35;
if(lineSpacing) {
xml.@style += "line-height: " + lineSpacing + "; "; xml.@style += "line-height: " + lineSpacing + "; ";
}
if(hangingIndent) { if(hangingIndent) {
xml.@style += "margin-left: " + hangingIndent + "em; text-indent: -" + hangingIndent + "em; "; if (multiField && !secondFieldAlign) {
throw ("second-field-align=false and hangingindent=true combination is not currently supported");
}
// If only one field, apply hanging indent on root
else if (!multiField) {
xml.@style += "padding-left: " + hangingIndent + "em; text-indent:-" + hangingIndent + "em;";
}
} }
// csl-entry // csl-entry
@ -319,18 +323,27 @@ Zotero.Cite.makeFormattedBibliography = function(cslEngine, format) {
// Padding on the label column, which we need to include when // Padding on the label column, which we need to include when
// calculating offset of right column // calculating offset of right column
var rightPadding = .7; var rightPadding = .5;
// One of the characters is usually a period, so we can adjust this down a bit
var adjMaxOffset = Math.max(1, maxOffset - 2);
// div.csl-left-margin // div.csl-left-margin
for each(var div in xml..div.(@class == "csl-left-margin")) { for each(var div in xml..div.(@class == "csl-left-margin")) {
div.@style = "float: left; width: " + adjMaxOffset + "em; text-align: right; padding-right: " + rightPadding + "em;"; div.@style = "float: left; padding-right: " + rightPadding + "em;";
// Right-align the labels if aligning second line, since it looks
// better and we don't need the second line of text to align with
// the left edge of the label
if (secondFieldAlign) {
div.@style += "text-align: right; width: " + maxOffset + "em;";
}
} }
// div.csl-right-inline // div.csl-right-inline
for each(var div in xml..div.(@class == "csl-right-inline")) { for each(var div in xml..div.(@class == "csl-right-inline")) {
div.@style = "margin: 0 .4em 0 " + (adjMaxOffset + rightPadding) + "em;"; div.@style = "margin: 0 .4em 0 " + (secondFieldAlign ? maxOffset + rightPadding : "0") + "em;";
if (hangingIndent) {
div.@style += "padding-left: " + hangingIndent + "em; text-indent:-" + hangingIndent + "em;";
}
} }
// div.csl-indent // div.csl-indent